forked from qt-creator/qt-creator
Also make ProjectLanguage a proper context
This commit is contained in:
@@ -33,7 +33,6 @@
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
#include <coreplugin/messagemanager.h>
|
||||
#include <coreplugin/uniqueidmanager.h>
|
||||
#include <projectexplorer/projectexplorer.h>
|
||||
#include <projectexplorer/projectexplorerconstants.h>
|
||||
#include <projectexplorer/session.h>
|
||||
@@ -44,9 +43,8 @@ using namespace GenericProjectManager::Internal;
|
||||
|
||||
Manager::Manager()
|
||||
{
|
||||
Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
|
||||
m_projectContext = Core::Context(GenericProjectManager::Constants::PROJECTCONTEXT);
|
||||
m_projectLanguage = uidm->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
|
||||
m_projectLanguage = Core::Context(ProjectExplorer::Constants::LANG_CXX);
|
||||
}
|
||||
|
||||
Manager::~Manager()
|
||||
@@ -55,7 +53,7 @@ Manager::~Manager()
|
||||
Core::Context Manager::projectContext() const
|
||||
{ return m_projectContext; }
|
||||
|
||||
int Manager::projectLanguage() const
|
||||
Core::Context Manager::projectLanguage() const
|
||||
{ return m_projectLanguage; }
|
||||
|
||||
QString Manager::mimeType() const
|
||||
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
virtual ~Manager();
|
||||
|
||||
virtual Core::Context projectContext() const;
|
||||
virtual int projectLanguage() const;
|
||||
virtual Core::Context projectLanguage() const;
|
||||
|
||||
virtual QString mimeType() const;
|
||||
virtual ProjectExplorer::Project *openProject(const QString &fileName);
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
|
||||
private:
|
||||
Core::Context m_projectContext;
|
||||
int m_projectLanguage;
|
||||
Core::Context m_projectLanguage;
|
||||
QList<GenericProject *> m_projects;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user