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>

src/plugins/qbsprojectmanager/qbsbuildconfiguration.h

@@ -85,9 +85,9 @@ public:
     QString configurationName() const;
     QString equivalentCommandLine(const QbsBuildStepData &stepData) const;
 
-    ProjectExplorer::TriState qmlDebuggingSetting() const;
-    ProjectExplorer::TriState qtQuickCompilerSetting() const;
-    ProjectExplorer::TriState separateDebugInfoSetting() const;
+    Utils::TriState qmlDebuggingSetting() const;
+    Utils::TriState qtQuickCompilerSetting() const;
+    Utils::TriState separateDebugInfoSetting() const;
 
 signals:
     void qbsConfigurationChanged();
@@ -100,7 +100,7 @@ private:
     QStringList m_changedFiles;
     QStringList m_activeFileTags;
     QStringList m_products;
-    ProjectExplorer::StringAspect *m_configurationName = nullptr;
+    Utils::StringAspect *m_configurationName = nullptr;
     QbsBuildSystem *m_buildSystem = nullptr;
 };
 

src/plugins/qbsprojectmanager/qbsbuildstep.cpp

@@ -32,7 +32,6 @@
 #include "qbssettings.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/variablechooser.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -43,6 +42,7 @@
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
+#include <utils/variablechooser.h>
 
 #include <QBoxLayout>
 #include <QCheckBox>
@@ -637,7 +637,7 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
     cleanInstallRootCheckBox->setText(tr("Clean install root"));
     defaultInstallDirCheckBox->setText(tr("Use default location"));
 
-    auto chooser = new Core::VariableChooser(this);
+    auto chooser = new VariableChooser(this);
     chooser->addSupportedWidget(propertyEdit);
     chooser->addSupportedWidget(installDirChooser->lineEdit());
     chooser->addMacroExpanderProvider([step] { return step->macroExpander(); });

src/plugins/qbsprojectmanager/qbscleanstep.cpp

@@ -41,6 +41,7 @@
 #include <QJsonObject>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace QbsProjectManager {
 namespace Internal {

src/plugins/qbsprojectmanager/qbscleanstep.h

@@ -28,11 +28,13 @@
 #include "qbsbuildconfiguration.h"
 
 #include <projectexplorer/buildstep.h>
-#include <projectexplorer/projectconfigurationaspects.h>
 #include <projectexplorer/task.h>
 
+#include <utils/aspects.h>
+
 namespace QbsProjectManager {
 namespace Internal {
+
 class ErrorInfo;
 class QbsSession;
 
@@ -60,8 +62,8 @@ private:
     void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
                              const QString &message, const QString &file, int line);
 
-    ProjectExplorer::BoolAspect *m_dryRunAspect = nullptr;
-    ProjectExplorer::BoolAspect *m_keepGoingAspect = nullptr;
+    Utils::BoolAspect *m_dryRunAspect = nullptr;
+    Utils::BoolAspect *m_keepGoingAspect = nullptr;
 
     QStringList m_products;
     QbsSession *m_session = nullptr;

src/plugins/qbsprojectmanager/qbsinstallstep.cpp

@@ -38,6 +38,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
+#include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 
 #include <QJsonObject>
@@ -45,6 +46,7 @@
 #include <QPlainTextEdit>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace QbsProjectManager {
 namespace Internal {

src/plugins/qbsprojectmanager/qbsinstallstep.h

@@ -29,11 +29,13 @@
 #include "qbssession.h"
 
 #include <projectexplorer/buildstep.h>
-#include <projectexplorer/projectconfigurationaspects.h>
 #include <projectexplorer/task.h>
 
+#include <utils/aspects.h>
+
 namespace QbsProjectManager {
 namespace Internal {
+
 class ErrorInfo;
 class QbsSession;
 
@@ -62,9 +64,9 @@ private:
     void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
                              const QString &message, const Utils::FilePath &file, int line);
 
-    ProjectExplorer::BoolAspect *m_cleanInstallRoot = nullptr;
-    ProjectExplorer::BoolAspect *m_dryRun = nullptr;
-    ProjectExplorer::BoolAspect *m_keepGoing = nullptr;
+    Utils::BoolAspect *m_cleanInstallRoot = nullptr;
+    Utils::BoolAspect *m_dryRun = nullptr;
+    Utils::BoolAspect *m_keepGoing = nullptr;
 
     QbsSession *m_session = nullptr;
     QString m_description;