From 5254765e164611bf02ea03ec8c6ba7fa496b46a1 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 22 Aug 2023 09:54:38 +0200 Subject: [PATCH] ProjectExplorer: Re-organize KitAspect layouting related functions Less obscure as it's fairly close to the standard pattern now. Change-Id: I4680465fbdb9fb6a458c18ef0534e4d8a4a31d1e Reviewed-by: Reviewed-by: Christian Stenger --- .../cmakeprojectmanager/cmakebuildconfiguration.cpp | 6 +++--- src/plugins/cmakeprojectmanager/cmakekitaspect.cpp | 6 +++--- src/plugins/debugger/debuggerkitaspect.cpp | 2 +- src/plugins/mcusupport/mcukitaspect.cpp | 2 +- .../mesonprojectmanager/toolkitaspectwidget.h | 2 +- src/plugins/projectexplorer/kitaspects.cpp | 12 ++++++------ src/plugins/projectexplorer/kitmanager.cpp | 4 ++-- src/plugins/projectexplorer/kitmanager.h | 4 +++- .../projectexplorer/kitmanagerconfigwidget.cpp | 2 +- src/plugins/qbsprojectmanager/qbskitaspect.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakekitaspect.cpp | 2 +- src/plugins/qtsupport/qtkitaspect.cpp | 12 ++++++------ 12 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 228e74336ca..6fab3af48db 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -651,13 +651,13 @@ void CMakeBuildSettingsWidget::kitCMakeConfiguration() Layouting::Grid grid; KitAspect *widget = CMakeKitAspect::createKitAspect(m_buildConfig->kit()); widget->setParent(dialog); - widget->addToLayoutWithLabel(grid); + widget->addToLayout(grid); widget = CMakeGeneratorKitAspect::createKitAspect(m_buildConfig->kit()); widget->setParent(dialog); - widget->addToLayoutWithLabel(grid); + widget->addToLayout(grid); widget = CMakeConfigurationKitAspect::createKitAspect(m_buildConfig->kit()); widget->setParent(dialog); - widget->addToLayoutWithLabel(grid); + widget->addToLayout(grid); grid.attachTo(dialog); auto layout = qobject_cast(dialog->layout()); diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp index b3c4826ef2c..2c2b440b8ab 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp @@ -149,7 +149,7 @@ private: // KitAspectWidget interface void makeReadOnly() override { m_comboBox->setEnabled(false); } - void addToLayout(Layouting::LayoutItem &builder) override + void addToLayoutImpl(Layouting::LayoutItem &builder) override { addMutableAction(m_comboBox); builder.addItem(m_comboBox); @@ -373,7 +373,7 @@ private: // KitAspectWidget interface void makeReadOnly() override { m_changeButton->setEnabled(false); } - void addToLayout(Layouting::LayoutItem &parent) override + void addToLayoutImpl(Layouting::LayoutItem &parent) override { addMutableAction(m_label); parent.addItem(m_label); @@ -912,7 +912,7 @@ public: private: // KitAspectWidget interface - void addToLayout(Layouting::LayoutItem &parent) override + void addToLayoutImpl(Layouting::LayoutItem &parent) override { addMutableAction(m_summaryLabel); parent.addItem(m_summaryLabel); diff --git a/src/plugins/debugger/debuggerkitaspect.cpp b/src/plugins/debugger/debuggerkitaspect.cpp index af3c4050cb6..54548ced074 100644 --- a/src/plugins/debugger/debuggerkitaspect.cpp +++ b/src/plugins/debugger/debuggerkitaspect.cpp @@ -66,7 +66,7 @@ public: } private: - void addToLayout(Layouting::LayoutItem &parent) override + void addToLayoutImpl(Layouting::LayoutItem &parent) override { addMutableAction(m_comboBox); parent.addItem(m_comboBox); diff --git a/src/plugins/mcusupport/mcukitaspect.cpp b/src/plugins/mcusupport/mcukitaspect.cpp index 3a26f37614d..f53dcacfd04 100644 --- a/src/plugins/mcusupport/mcukitaspect.cpp +++ b/src/plugins/mcusupport/mcukitaspect.cpp @@ -24,7 +24,7 @@ public: void makeReadOnly() override {} void refresh() override {} - void addToLayout(Layouting::LayoutItem &) override {} + void addToLayoutImpl(Layouting::LayoutItem &) override {} }; Utils::Id McuDependenciesKitAspect::id() diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h index 3cfb186b4f9..9a354dc1e75 100644 --- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h +++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h @@ -36,7 +36,7 @@ private: void makeReadOnly() override { m_toolsComboBox->setEnabled(false); } - void addToLayout(Layouting::LayoutItem &parent) override + void addToLayoutImpl(Layouting::LayoutItem &parent) override { addMutableAction(m_toolsComboBox); parent.addItem(m_toolsComboBox); diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp index 825af13628f..7bd7435d143 100644 --- a/src/plugins/projectexplorer/kitaspects.cpp +++ b/src/plugins/projectexplorer/kitaspects.cpp @@ -64,7 +64,7 @@ public: private: void makeReadOnly() override { m_chooser->setReadOnly(true); } - void addToLayout(Layouting::LayoutItem &builder) override + void addToLayoutImpl(Layouting::LayoutItem &builder) override { addMutableAction(m_chooser); builder.addItem(Layouting::Span(2, m_chooser)); @@ -241,7 +241,7 @@ public: } private: - void addToLayout(Layouting::LayoutItem &builder) override + void addToLayoutImpl(Layouting::LayoutItem &builder) override { addMutableAction(m_mainWidget); builder.addItem(m_mainWidget); @@ -810,7 +810,7 @@ public: ~DeviceTypeKitAspectImpl() override { delete m_comboBox; } private: - void addToLayout(Layouting::LayoutItem &builder) override + void addToLayoutImpl(Layouting::LayoutItem &builder) override { addMutableAction(m_comboBox); builder.addItem(m_comboBox); @@ -959,7 +959,7 @@ public: } private: - void addToLayout(Layouting::LayoutItem &builder) override + void addToLayoutImpl(Layouting::LayoutItem &builder) override { addMutableAction(m_comboBox); builder.addItem(m_comboBox); @@ -1241,7 +1241,7 @@ public: } private: - void addToLayout(Layouting::LayoutItem &builder) override + void addToLayoutImpl(Layouting::LayoutItem &builder) override { addMutableAction(m_comboBox); builder.addItem(m_comboBox); @@ -1506,7 +1506,7 @@ public: } private: - void addToLayout(Layouting::LayoutItem &builder) override + void addToLayoutImpl(Layouting::LayoutItem &builder) override { addMutableAction(m_mainWidget); builder.addItem(m_mainWidget); diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 9685f35c2e9..5215d15fbf0 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -734,7 +734,7 @@ KitAspect::~KitAspect() delete m_mutableAction; } -void KitAspect::addToLayoutWithLabel(Layouting::LayoutItem &parentItem) +void KitAspect::addToLayout(Layouting::LayoutItem &parentItem) { auto label = createSubWidget(m_factory->displayName() + ':'); label->setToolTip(m_factory->description()); @@ -743,7 +743,7 @@ void KitAspect::addToLayoutWithLabel(Layouting::LayoutItem &parentItem) }); parentItem.addItem(label); - addToLayout(parentItem); + addToLayoutImpl(parentItem); parentItem.addItem(Layouting::br); } diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index db11d3afb94..a71538cef9c 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -113,7 +113,7 @@ public: virtual void makeReadOnly() = 0; virtual void refresh() = 0; - void addToLayoutWithLabel(Layouting::LayoutItem &parentItem); + void addToLayout(Layouting::LayoutItem &parentItem) override; static QString msgManage(); @@ -124,6 +124,8 @@ public: QWidget *createManageButton(Utils::Id pageId); protected: + virtual void addToLayoutImpl(Layouting::LayoutItem &parentItem) = 0; + Kit *m_kit; const KitAspectFactory *m_factory; QAction *m_mutableAction = nullptr; diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 98b14cee309..b939921ebec 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -201,7 +201,7 @@ void KitManagerConfigWidget::addAspectToWorkingCopy(Layouting::LayoutItem &paren QTC_ASSERT(aspect, return); QTC_ASSERT(!m_kitAspects.contains(aspect), return); - aspect->addToLayoutWithLabel(parent); + aspect->addToLayout(parent); m_kitAspects.append(aspect); connect(aspect->mutableAction(), &QAction::toggled, diff --git a/src/plugins/qbsprojectmanager/qbskitaspect.cpp b/src/plugins/qbsprojectmanager/qbskitaspect.cpp index e709a0d2bcb..647f44f02c7 100644 --- a/src/plugins/qbsprojectmanager/qbskitaspect.cpp +++ b/src/plugins/qbsprojectmanager/qbskitaspect.cpp @@ -34,7 +34,7 @@ private: void makeReadOnly() override { m_changeButton->setEnabled(false); } void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); } - void addToLayout(Layouting::LayoutItem &parent) override + void addToLayoutImpl(Layouting::LayoutItem &parent) override { addMutableAction(m_contentLabel); parent.addItem(m_contentLabel); diff --git a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp index 7fc5bec0a58..18033f9dfc1 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp @@ -39,7 +39,7 @@ public: ~QmakeKitAspectImpl() override { delete m_lineEdit; } private: - void addToLayout(Layouting::LayoutItem &parent) override + void addToLayoutImpl(Layouting::LayoutItem &parent) override { addMutableAction(m_lineEdit); parent.addItem(m_lineEdit); diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp index 5fcb91acdd8..d6fa4a21225 100644 --- a/src/plugins/qtsupport/qtkitaspect.cpp +++ b/src/plugins/qtsupport/qtkitaspect.cpp @@ -30,10 +30,10 @@ using namespace Utils; namespace QtSupport { namespace Internal { -class QtKitAspectWidget final : public KitAspect +class QtKitAspectImpl final : public KitAspect { public: - QtKitAspectWidget(Kit *k, const KitAspectFactory *ki) : KitAspect(k, ki) + QtKitAspectImpl(Kit *k, const KitAspectFactory *ki) : KitAspect(k, ki) { m_combo = createSubWidget(); m_combo->setSizePolicy(QSizePolicy::Ignored, m_combo->sizePolicy().verticalPolicy()); @@ -51,10 +51,10 @@ public: connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, this, - &QtKitAspectWidget::refresh); + &QtKitAspectImpl::refresh); } - ~QtKitAspectWidget() final + ~QtKitAspectImpl() final { delete m_combo; delete m_manageButton; @@ -63,7 +63,7 @@ public: private: void makeReadOnly() final { m_combo->setEnabled(false); } - void addToLayout(Layouting::LayoutItem &parent) + void addToLayoutImpl(Layouting::LayoutItem &parent) { addMutableAction(m_combo); parent.addItem(m_combo); @@ -293,7 +293,7 @@ void QtKitAspectFactory::fix(Kit *k) KitAspect *QtKitAspectFactory::createKitAspect(Kit *k) const { QTC_ASSERT(k, return nullptr); - return new Internal::QtKitAspectWidget(k, this); + return new Internal::QtKitAspectImpl(k, this); } QString QtKitAspectFactory::displayNamePostfix(const Kit *k) const