From 1d23f8b93d493655a105ef0ab331547174c2971e Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 11 Feb 2019 16:42:49 +0100 Subject: [PATCH] ProjectExplorer: Shift parts of KitManagerConfigWidget creation ... from the kit manager to the actual KitManagerConfigWidget Preliminary to more direct use of e.g. KitAspect::description() Change-Id: I20fd027903938904b3725d25483eca26b5bb0262 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/kitmanager.cpp | 2 +- src/plugins/projectexplorer/kitmanagerconfigwidget.cpp | 4 +++- src/plugins/projectexplorer/kitmanagerconfigwidget.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 3ecfee65140..09df1415bcf 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -374,7 +374,7 @@ KitManagerConfigWidget *KitManager::createConfigWidget(Kit *k) { auto *result = new KitManagerConfigWidget(k); foreach (KitAspect *ki, kitInformation()) - result->addConfigWidget(ki->createConfigWidget(result->workingCopy())); + result->addAspectToWorkingCopy(ki); result->updateVisibility(); diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 5a3895d0c24..05aea733aee 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -211,8 +211,10 @@ QString KitManagerConfigWidget::validityMessage() const return m_modifiedKit->toHtml(tmp); } -void KitManagerConfigWidget::addConfigWidget(KitAspectWidget *widget) +void KitManagerConfigWidget::addAspectToWorkingCopy(KitAspect *aspect) { + QTC_ASSERT(aspect, return); + KitAspectWidget *widget = aspect->createConfigWidget(workingCopy()); QTC_ASSERT(widget, return); QTC_ASSERT(!m_widgets.contains(widget), return); diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.h b/src/plugins/projectexplorer/kitmanagerconfigwidget.h index 14694ee1375..8617a118cf5 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.h +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.h @@ -60,7 +60,7 @@ public: bool isValid() const; bool hasWarning() const; QString validityMessage() const; - void addConfigWidget(KitAspectWidget *widget); + void addAspectToWorkingCopy(KitAspect *aspect); void makeStickySubWidgetsReadOnly(); Kit *workingCopy() const;