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

C++: Move the ModelManagerInterface from CppTools to CPlusPlus.

Browse Source
This commit is contained in:
Christian Kamm
2010-12-03 13:49:35 +01:00
parent 5de7be5f91
commit 5f50a6ae34
45 changed files with 268 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -51,7 +51,7 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <cpptools/cppmodelmanagerinterface.h>
#include <cplusplus/ModelManagerInterface.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/buildenvironmentwidget.h>
@@ -421,9 +421,9 @@ void Qt4Project::updateCppCodeModel()
{
Qt4BuildConfiguration *activeBC = activeTarget()->activeBuildConfiguration();
CppTools::CppModelManagerInterface *modelmanager =
CPlusPlus::CppModelManagerInterface *modelmanager =
ExtensionSystem::PluginManager::instance()
->getObject<CppTools::CppModelManagerInterface>();
->getObject<CPlusPlus::CppModelManagerInterface>();
if (!modelmanager)
return;
@@ -544,7 +544,7 @@ void Qt4Project::updateCppCodeModel()
files += m_projectFiles->files[SourceType];
files += m_projectFiles->generatedFiles[SourceType];
CppTools::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this);
CPlusPlus::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this);
//qDebug()<<"Using precompiled header"<<allPrecompileHeaders;