Utils/ProjectExplorer: Move re-usabled bits of aspects to Utils

Classes involved are BaseAspect and some derived classes,
LayoutBuilder and VariableChooser.

This is mostly mechanical, with various include/using changes
to make it compile.

Change-Id: I624a457f3555f102e541c4c71e33a9423af32250
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 94299bc5df..905667411e 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -35,13 +35,13 @@
 #include "projectexplorerconstants.h"
 #include "target.h"
 
-#include <coreplugin/variablechooser.h>
-
 #include <utils/algorithm.h>
 #include <utils/fileinprojectfinder.h>
+#include <utils/layoutbuilder.h>
 #include <utils/outputformatter.h>
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
+#include <utils/variablechooser.h>
 
 #include <QFormLayout>
 #include <QFutureWatcher>
@@ -159,7 +159,7 @@ BuildStepConfigWidget *BuildStep::createConfigWidget()
 
     {
         LayoutBuilder builder(widget);
-        for (ProjectConfigurationAspect *aspect : m_aspects) {
+        for (BaseAspect *aspect : qAsConst(m_aspects)) {
             if (aspect->isVisible())
                 aspect->addToLayout(builder.startNewRow());
         }
@@ -171,7 +171,7 @@ BuildStepConfigWidget *BuildStep::createConfigWidget()
     widget->setSummaryUpdater(m_summaryUpdater);
 
     if (m_addMacroExpander)
-        Core::VariableChooser::addSupportForChildWidgets(widget, macroExpander());
+        VariableChooser::addSupportForChildWidgets(widget, macroExpander());
 
     return widget;
 }
@@ -493,7 +493,7 @@ BuildStepConfigWidget::BuildStepConfigWidget(BuildStep *step)
     connect(m_step, &ProjectConfiguration::displayNameChanged,
             this, &BuildStepConfigWidget::updateSummary);
     for (auto aspect : step->aspects()) {
-        connect(aspect, &ProjectConfigurationAspect::changed,
+        connect(aspect, &BaseAspect::changed,
                 this, &BuildStepConfigWidget::recreateSummary);
     }
 }