feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Reviewed-by: dt
This commit is contained in:
hjk
2011-04-12 12:17:19 +02:00
parent 4a338a5129
commit 1738d08ffc
18 changed files with 63 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -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();

11
src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
View File

@@ -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); }

6
src/plugins/qmlprojectmanager/qmlprojectmanager.h
View File

@@ -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;
};