QmlProjectManager: Prepare special aspects for auto-registration

Change-Id: I9b5e019dfeaf394107a190e78e8880b4f16b9ee9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp

@@ -37,8 +37,8 @@ static bool caseInsensitiveLessThan(const FilePath &s1, const FilePath &s2)
     return s1.toString().toCaseFolded() < s2.toString().toCaseFolded();
 }
 
-QmlMainFileAspect::QmlMainFileAspect(Target *target)
+QmlMainFileAspect::QmlMainFileAspect(AspectContainer *container)
-    : m_target(target)
+    : BaseAspect(container)
     , m_scriptFile(M_CURRENT_FILE)
 {
     addDataExtractor(this, &QmlMainFileAspect::mainScript, &Data::mainScript);
@@ -158,6 +158,11 @@ void QmlMainFileAspect::setMainScript(int index)
     }
 }
 
+void QmlMainFileAspect::setTarget(ProjectExplorer::Target *target)
+{
+    m_target = target;
+}
+
 void QmlMainFileAspect::setScriptSource(MainScriptSource source, const QString &settingsPath)
 {
     if (source == FileInEditor) {

src/plugins/qmlprojectmanager/qmlmainfileaspect.h

@@ -27,7 +27,7 @@ class QMLPROJECTMANAGER_EXPORT QmlMainFileAspect : public Utils::BaseAspect
     Q_OBJECT
 
 public:
-    explicit QmlMainFileAspect(ProjectExplorer::Target *target);
+    explicit QmlMainFileAspect(Utils::AspectContainer *container = nullptr);
     ~QmlMainFileAspect() override;
 
     enum MainScriptSource {
@@ -50,6 +50,7 @@ public:
     MainScriptSource mainScriptSource() const;
     void setMainScript(int index);
 
+    void setTarget(ProjectExplorer::Target *target);
     void setScriptSource(MainScriptSource source, const QString &settingsPath = QString());
 
     Utils::FilePath mainScript() const;

src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp

@@ -14,6 +14,11 @@
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
+using namespace ProjectExplorer;
+using namespace Utils;
+
+namespace QmlProjectManager {
+
 static bool isMultilanguagePresent()
 {
     const QVector<ExtensionSystem::PluginSpec *> &specs = ExtensionSystem::PluginManager::plugins();
@@ -24,7 +29,7 @@ static bool isMultilanguagePresent()
            != specs.cend();
 }
 
-static Utils::FilePath getMultilanguageDatabaseFilePath(ProjectExplorer::Target *target)
+static FilePath getMultilanguageDatabaseFilePath(ProjectExplorer::Target *target)
 {
     if (target) {
         auto filePath = target->project()->projectDirectory().pathAppended("translations.db");
@@ -48,11 +53,8 @@ static QObject *getPreviewPlugin()
     return nullptr;
 }
 
-
+QmlMultiLanguageAspect::QmlMultiLanguageAspect(AspectContainer *container)
-namespace QmlProjectManager {
+    : BoolAspect(container)
-
-QmlMultiLanguageAspect::QmlMultiLanguageAspect(ProjectExplorer::Target *target)
-    : m_target(target)
 {
     setVisible(isMultilanguagePresent());
     setSettingsKey(Constants::USE_MULTILANGUAGE_KEY);
@@ -66,8 +68,7 @@ QmlMultiLanguageAspect::QmlMultiLanguageAspect(ProjectExplorer::Target *target)
     addDataExtractor(this, &QmlMultiLanguageAspect::origin, &Data::origin);
 
     connect(this, &BoolAspect::changed, this, [this] {
-        for (ProjectExplorer::RunControl *runControl :
+        for (RunControl *runControl : ProjectExplorerPlugin::allRunControls()) {
-                ProjectExplorer::ProjectExplorerPlugin::allRunControls()) {
             if (runControl->aspect<QmlMultiLanguageAspect>()->origin == this)
                 runControl->initiateStop();
         }
@@ -78,6 +79,11 @@ QmlMultiLanguageAspect::~QmlMultiLanguageAspect()
 {
 }
 
+void QmlMultiLanguageAspect::setTarget(Target *target)
+{
+    m_target = target;
+}
+
 void QmlMultiLanguageAspect::setCurrentLocale(const QString &locale)
 {
     if (m_currentLocale == locale)
@@ -114,19 +120,19 @@ void QmlMultiLanguageAspect::fromMap(const QVariantMap &map)
 
 QmlMultiLanguageAspect *QmlMultiLanguageAspect::current()
 {
-    if (auto project = ProjectExplorer::ProjectManager::startupProject())
+    if (auto project = ProjectManager::startupProject())
         return current(project);
     return {};
 }
 
-QmlMultiLanguageAspect *QmlMultiLanguageAspect::current(ProjectExplorer::Project *project)
+QmlMultiLanguageAspect *QmlMultiLanguageAspect::current(Project *project)
 {
     if (auto target = project->activeTarget())
         return current(target);
     return {};
 }
 
-QmlMultiLanguageAspect *QmlMultiLanguageAspect::current(ProjectExplorer::Target *target)
+QmlMultiLanguageAspect *QmlMultiLanguageAspect::current(Target *target)
 {
     if (!target)
         return {};

src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h

@@ -15,9 +15,11 @@ class QMLPROJECTMANAGER_EXPORT QmlMultiLanguageAspect : public Utils::BoolAspect
 {
     Q_OBJECT
 public:
-    explicit QmlMultiLanguageAspect(ProjectExplorer::Target *target);
+    explicit QmlMultiLanguageAspect(Utils::AspectContainer *container = nullptr);
     ~QmlMultiLanguageAspect() override;
 
+    void setTarget(ProjectExplorer::Target *target);
+
     QString currentLocale() const;
     void setCurrentLocale(const QString &locale);
     Utils::FilePath databaseFilePath() const;

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

@@ -120,14 +120,16 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
         return cmd;
     });
 
-    m_qmlMainFileAspect = addAspect<QmlMainFileAspect>(target);
+    m_qmlMainFileAspect = addAspect<QmlMainFileAspect>();
+    m_qmlMainFileAspect->setTarget(target);
     connect(m_qmlMainFileAspect, &QmlMainFileAspect::changed, this, &RunConfiguration::update);
 
     createQtVersionAspect();
 
     connect(target, &Target::kitChanged, this, &RunConfiguration::update);
 
-    m_multiLanguageAspect = addAspect<QmlMultiLanguageAspect>(target);
+    m_multiLanguageAspect = addAspect<QmlMultiLanguageAspect>();
+    m_multiLanguageAspect->setTarget(target);
     auto buildSystem = qobject_cast<const QmlBuildSystem *>(activeBuildSystem());
     if (buildSystem)
         m_multiLanguageAspect->setValue(buildSystem->multilanguageSupport());