projectexplorer: move project{Context,Language} from IProjectManager to Project

Reviewed-by: dt

3 files changed, 4 insertions, 17 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index ac49825e60..264ff05e9c 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -37,6 +37,7 @@
 #include "fileformat/qmlprojectitem.h"
 #include "qmlprojectrunconfiguration.h"
 #include "qmlprojecttarget.h"
+#include "qmlprojectconstants.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
@@ -58,6 +59,9 @@ QmlProject::QmlProject(Internal::Manager *manager, const QString &fileName)
       m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlJS::ModelManagerInterface>()),
       m_fileWatcher(new ProjectExplorer::FileWatcher(this))
 {
+    setProjectContext(Core::Context(QmlProjectManager::Constants::PROJECTCONTEXT));
+    setProjectLanguage(Core::Context(QmlProjectManager::Constants::LANG_QML));
+
     QFileInfo fileInfo(m_fileName);
     m_projectName = fileInfo.completeBaseName();
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
index 38d35629cb..775a052ec9 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
@@ -49,19 +49,8 @@ namespace Internal {
 
 Manager::Manager()
 {
-    m_projectContext  = Core::Context(QmlProjectManager::Constants::PROJECTCONTEXT);
-    m_projectLanguage = Core::Context(QmlProjectManager::Constants::LANG_QML);
 }
 
-Manager::~Manager()
-{ }
-
-Core::Context Manager::projectContext() const
-{ return m_projectContext; }
-
-Core::Context Manager::projectLanguage() const
-{ return m_projectLanguage; }
-
 QString Manager::mimeType() const
 { return QLatin1String(Constants::QMLMIMETYPE); }
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.h b/src/plugins/qmlprojectmanager/qmlprojectmanager.h
index 45891f8ffc..a5fd26b9ce 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.h
@@ -49,10 +49,6 @@ class Manager: public ProjectExplorer::IProjectManager
 
 public:
     Manager();
-    virtual ~Manager();
-
-    virtual Core::Context projectContext() const;
-    virtual Core::Context projectLanguage() const;
 
     virtual QString mimeType() const;
     virtual ProjectExplorer::Project *openProject(const QString &fileName);
@@ -63,8 +59,6 @@ public:
     void unregisterProject(QmlProject *project);
 
 private:
-    Core::Context m_projectContext;
-    Core::Context m_projectLanguage;
     QList<QmlProject *> m_projects;
 };