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

Also make ProjectLanguage a proper context

Browse Source
This commit is contained in:
dt
2010-07-02 14:00:05 +02:00
parent 0801047287
commit dd0978796e
9 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -52,9 +52,8 @@ using namespace CMakeProjectManager::Internal;
CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage)
: m_settingsPage(cmakeSettingsPage)
{
Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_projectContext = Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT);
m_projectLanguage = uidm->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
m_projectLanguage = Core::Context(ProjectExplorer::Constants::LANG_CXX);
}
Core::Context CMakeManager::projectContext() const
@@ -62,7 +61,7 @@ Core::Context CMakeManager::projectContext() const
return m_projectContext;
}
int CMakeManager::projectLanguage() const
Core::Context CMakeManager::projectLanguage() const
{
return m_projectLanguage;
}

4
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
View File

@@ -53,7 +53,7 @@ public:
CMakeManager(CMakeSettingsPage *cmakeSettingsPage);
virtual Core::Context projectContext() const;
virtual int projectLanguage() const;
virtual Core::Context projectLanguage() const;
virtual ProjectExplorer::Project *openProject(const QString &fileName);
virtual QString mimeType() const;
@@ -77,7 +77,7 @@ private:
static QString qtVersionForQMake(const QString &qmakePath);
static QPair<QString, QString> findQtDir(const ProjectExplorer::Environment &env);
Core::Context m_projectContext;
int m_projectLanguage;
Core::Context m_projectLanguage;
CMakeSettingsPage *m_settingsPage;
};