feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Re-organize KitAspect layouting related functions

Browse Source 
Less obscure as it's fairly close to the standard pattern now.

Change-Id: I4680465fbdb9fb6a458c18ef0534e4d8a4a31d1e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-08-22 09:54:38 +02:00
parent 0667bdaedc
commit 5254765e16
12 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -651,13 +651,13 @@ void CMakeBuildSettingsWidget::kitCMakeConfiguration()
Layouting::Grid grid; Layouting::Grid grid;
KitAspect *widget = CMakeKitAspect::createKitAspect(m_buildConfig->kit()); KitAspect *widget = CMakeKitAspect::createKitAspect(m_buildConfig->kit());
widget->setParent(dialog); widget->setParent(dialog);
widget->addToLayoutWithLabel(grid); widget->addToLayout(grid);
widget = CMakeGeneratorKitAspect::createKitAspect(m_buildConfig->kit()); widget = CMakeGeneratorKitAspect::createKitAspect(m_buildConfig->kit());
widget->setParent(dialog); widget->setParent(dialog);
widget->addToLayoutWithLabel(grid); widget->addToLayout(grid);
widget = CMakeConfigurationKitAspect::createKitAspect(m_buildConfig->kit()); widget = CMakeConfigurationKitAspect::createKitAspect(m_buildConfig->kit());
widget->setParent(dialog); widget->setParent(dialog);
widget->addToLayoutWithLabel(grid); widget->addToLayout(grid);
grid.attachTo(dialog); grid.attachTo(dialog);
auto layout = qobject_cast<QGridLayout *>(dialog->layout()); auto layout = qobject_cast<QGridLayout *>(dialog->layout());

6
src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
View File

@@ -149,7 +149,7 @@ private:
// KitAspectWidget interface // KitAspectWidget interface
void makeReadOnly() override { m_comboBox->setEnabled(false); } void makeReadOnly() override { m_comboBox->setEnabled(false); }
void addToLayout(Layouting::LayoutItem &builder) override void addToLayoutImpl(Layouting::LayoutItem &builder) override
{ {
addMutableAction(m_comboBox); addMutableAction(m_comboBox);
builder.addItem(m_comboBox); builder.addItem(m_comboBox);
@@ -373,7 +373,7 @@ private:
// KitAspectWidget interface // KitAspectWidget interface
void makeReadOnly() override { m_changeButton->setEnabled(false); } void makeReadOnly() override { m_changeButton->setEnabled(false); }
void addToLayout(Layouting::LayoutItem &parent) override void addToLayoutImpl(Layouting::LayoutItem &parent) override
{ {
addMutableAction(m_label); addMutableAction(m_label);
parent.addItem(m_label); parent.addItem(m_label);
@@ -912,7 +912,7 @@ public:
private: private:
// KitAspectWidget interface // KitAspectWidget interface
void addToLayout(Layouting::LayoutItem &parent) override void addToLayoutImpl(Layouting::LayoutItem &parent) override
{ {
addMutableAction(m_summaryLabel); addMutableAction(m_summaryLabel);
parent.addItem(m_summaryLabel); parent.addItem(m_summaryLabel);

2
src/plugins/debugger/debuggerkitaspect.cpp
View File

@@ -66,7 +66,7 @@ public:
} }
private: private:
void addToLayout(Layouting::LayoutItem &parent) override void addToLayoutImpl(Layouting::LayoutItem &parent) override
{ {
addMutableAction(m_comboBox); addMutableAction(m_comboBox);
parent.addItem(m_comboBox); parent.addItem(m_comboBox);

2
src/plugins/mcusupport/mcukitaspect.cpp
View File

@@ -24,7 +24,7 @@ public:
void makeReadOnly() override {} void makeReadOnly() override {}
void refresh() override {} void refresh() override {}
void addToLayout(Layouting::LayoutItem &) override {} void addToLayoutImpl(Layouting::LayoutItem &) override {}
}; };
Utils::Id McuDependenciesKitAspect::id() Utils::Id McuDependenciesKitAspect::id()

2
src/plugins/mesonprojectmanager/toolkitaspectwidget.h
View File

@@ -36,7 +36,7 @@ private:
void makeReadOnly() override { m_toolsComboBox->setEnabled(false); } void makeReadOnly() override { m_toolsComboBox->setEnabled(false); }
void addToLayout(Layouting::LayoutItem &parent) override void addToLayoutImpl(Layouting::LayoutItem &parent) override
{ {
addMutableAction(m_toolsComboBox); addMutableAction(m_toolsComboBox);
parent.addItem(m_toolsComboBox); parent.addItem(m_toolsComboBox);

12
src/plugins/projectexplorer/kitaspects.cpp
View File

@@ -64,7 +64,7 @@ public:
private: private:
void makeReadOnly() override { m_chooser->setReadOnly(true); } void makeReadOnly() override { m_chooser->setReadOnly(true); }
void addToLayout(Layouting::LayoutItem &builder) override void addToLayoutImpl(Layouting::LayoutItem &builder) override
{ {
addMutableAction(m_chooser); addMutableAction(m_chooser);
builder.addItem(Layouting::Span(2, m_chooser)); builder.addItem(Layouting::Span(2, m_chooser));
@@ -241,7 +241,7 @@ public:
} }
private: private:
void addToLayout(Layouting::LayoutItem &builder) override void addToLayoutImpl(Layouting::LayoutItem &builder) override
{ {
addMutableAction(m_mainWidget); addMutableAction(m_mainWidget);
builder.addItem(m_mainWidget); builder.addItem(m_mainWidget);
@@ -810,7 +810,7 @@ public:
~DeviceTypeKitAspectImpl() override { delete m_comboBox; } ~DeviceTypeKitAspectImpl() override { delete m_comboBox; }
private: private:
void addToLayout(Layouting::LayoutItem &builder) override void addToLayoutImpl(Layouting::LayoutItem &builder) override
{ {
addMutableAction(m_comboBox); addMutableAction(m_comboBox);
builder.addItem(m_comboBox); builder.addItem(m_comboBox);
@@ -959,7 +959,7 @@ public:
} }
private: private:
void addToLayout(Layouting::LayoutItem &builder) override void addToLayoutImpl(Layouting::LayoutItem &builder) override
{ {
addMutableAction(m_comboBox); addMutableAction(m_comboBox);
builder.addItem(m_comboBox); builder.addItem(m_comboBox);
@@ -1241,7 +1241,7 @@ public:
} }
private: private:
void addToLayout(Layouting::LayoutItem &builder) override void addToLayoutImpl(Layouting::LayoutItem &builder) override
{ {
addMutableAction(m_comboBox); addMutableAction(m_comboBox);
builder.addItem(m_comboBox); builder.addItem(m_comboBox);
@@ -1506,7 +1506,7 @@ public:
} }
private: private:
void addToLayout(Layouting::LayoutItem &builder) override void addToLayoutImpl(Layouting::LayoutItem &builder) override
{ {
addMutableAction(m_mainWidget); addMutableAction(m_mainWidget);
builder.addItem(m_mainWidget); builder.addItem(m_mainWidget);

4
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -734,7 +734,7 @@ KitAspect::~KitAspect()
delete m_mutableAction; delete m_mutableAction;
} }
void KitAspect::addToLayoutWithLabel(Layouting::LayoutItem &parentItem) void KitAspect::addToLayout(Layouting::LayoutItem &parentItem)
{ {
auto label = createSubWidget<QLabel>(m_factory->displayName() + ':'); auto label = createSubWidget<QLabel>(m_factory->displayName() + ':');
label->setToolTip(m_factory->description()); label->setToolTip(m_factory->description());
@@ -743,7 +743,7 @@ void KitAspect::addToLayoutWithLabel(Layouting::LayoutItem &parentItem)
}); });
parentItem.addItem(label); parentItem.addItem(label);
addToLayout(parentItem); addToLayoutImpl(parentItem);
parentItem.addItem(Layouting::br); parentItem.addItem(Layouting::br);
} }

4
src/plugins/projectexplorer/kitmanager.h
View File

@@ -113,7 +113,7 @@ public:
virtual void makeReadOnly() = 0; virtual void makeReadOnly() = 0;
virtual void refresh() = 0; virtual void refresh() = 0;
void addToLayoutWithLabel(Layouting::LayoutItem &parentItem); void addToLayout(Layouting::LayoutItem &parentItem) override;
static QString msgManage(); static QString msgManage();
@@ -124,6 +124,8 @@ public:
QWidget *createManageButton(Utils::Id pageId); QWidget *createManageButton(Utils::Id pageId);
protected: protected:
virtual void addToLayoutImpl(Layouting::LayoutItem &parentItem) = 0;
Kit *m_kit; Kit *m_kit;
const KitAspectFactory *m_factory; const KitAspectFactory *m_factory;
QAction *m_mutableAction = nullptr; QAction *m_mutableAction = nullptr;

2
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
View File

@@ -201,7 +201,7 @@ void KitManagerConfigWidget::addAspectToWorkingCopy(Layouting::LayoutItem &paren
QTC_ASSERT(aspect, return); QTC_ASSERT(aspect, return);
QTC_ASSERT(!m_kitAspects.contains(aspect), return); QTC_ASSERT(!m_kitAspects.contains(aspect), return);
aspect->addToLayoutWithLabel(parent); aspect->addToLayout(parent);
m_kitAspects.append(aspect); m_kitAspects.append(aspect);
connect(aspect->mutableAction(), &QAction::toggled, connect(aspect->mutableAction(), &QAction::toggled,

2
src/plugins/qbsprojectmanager/qbskitaspect.cpp
View File

@@ -34,7 +34,7 @@ private:
void makeReadOnly() override { m_changeButton->setEnabled(false); } void makeReadOnly() override { m_changeButton->setEnabled(false); }
void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); } void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); }
void addToLayout(Layouting::LayoutItem &parent) override void addToLayoutImpl(Layouting::LayoutItem &parent) override
{ {
addMutableAction(m_contentLabel); addMutableAction(m_contentLabel);
parent.addItem(m_contentLabel); parent.addItem(m_contentLabel);

2
src/plugins/qmakeprojectmanager/qmakekitaspect.cpp
View File

@@ -39,7 +39,7 @@ public:
~QmakeKitAspectImpl() override { delete m_lineEdit; } ~QmakeKitAspectImpl() override { delete m_lineEdit; }
private: private:
void addToLayout(Layouting::LayoutItem &parent) override void addToLayoutImpl(Layouting::LayoutItem &parent) override
{ {
addMutableAction(m_lineEdit); addMutableAction(m_lineEdit);
parent.addItem(m_lineEdit); parent.addItem(m_lineEdit);

12
src/plugins/qtsupport/qtkitaspect.cpp
View File

@@ -30,10 +30,10 @@ using namespace Utils;
namespace QtSupport { namespace QtSupport {
namespace Internal { namespace Internal {
class QtKitAspectWidget final : public KitAspect class QtKitAspectImpl final : public KitAspect
{ {
public: public:
QtKitAspectWidget(Kit *k, const KitAspectFactory *ki) : KitAspect(k, ki) QtKitAspectImpl(Kit *k, const KitAspectFactory *ki) : KitAspect(k, ki)
{ {
m_combo = createSubWidget<QComboBox>(); m_combo = createSubWidget<QComboBox>();
m_combo->setSizePolicy(QSizePolicy::Ignored, m_combo->sizePolicy().verticalPolicy()); m_combo->setSizePolicy(QSizePolicy::Ignored, m_combo->sizePolicy().verticalPolicy());
@@ -51,10 +51,10 @@ public:
connect(QtVersionManager::instance(), connect(QtVersionManager::instance(),
&QtVersionManager::qtVersionsChanged, &QtVersionManager::qtVersionsChanged,
this, this,
&QtKitAspectWidget::refresh); &QtKitAspectImpl::refresh);
} }
~QtKitAspectWidget() final ~QtKitAspectImpl() final
{ {
delete m_combo; delete m_combo;
delete m_manageButton; delete m_manageButton;
@@ -63,7 +63,7 @@ public:
private: private:
void makeReadOnly() final { m_combo->setEnabled(false); } void makeReadOnly() final { m_combo->setEnabled(false); }
void addToLayout(Layouting::LayoutItem &parent) void addToLayoutImpl(Layouting::LayoutItem &parent)
{ {
addMutableAction(m_combo); addMutableAction(m_combo);
parent.addItem(m_combo); parent.addItem(m_combo);
@@ -293,7 +293,7 @@ void QtKitAspectFactory::fix(Kit *k)
KitAspect *QtKitAspectFactory::createKitAspect(Kit *k) const KitAspect *QtKitAspectFactory::createKitAspect(Kit *k) const
{ {
QTC_ASSERT(k, return nullptr); QTC_ASSERT(k, return nullptr);
return new Internal::QtKitAspectWidget(k, this); return new Internal::QtKitAspectImpl(k, this);
} }
QString QtKitAspectFactory::displayNamePostfix(const Kit *k) const QString QtKitAspectFactory::displayNamePostfix(const Kit *k) const