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/genericprojectmanager/genericproject.cpp
View File

@@ -41,7 +41,7 @@
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <cpptools/cppmodelmanagerinterface.h>
#include <cplusplus/ModelManagerInterface.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/pathchooser.h>
#include <coreplugin/icore.h>
@@ -203,13 +203,13 @@ void GenericProject::refresh(RefreshOptions options)
if (options & Files)
m_rootNode->refresh();
CppTools::CppModelManagerInterface *modelManager =
ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>();
CPlusPlus::CppModelManagerInterface *modelManager =
ExtensionSystem::PluginManager::instance()->getObject<CPlusPlus::CppModelManagerInterface>();
if (m_toolChain && modelManager) {
const QByteArray predefinedMacros = m_toolChain->predefinedMacros();
CppTools::CppModelManagerInterface::ProjectInfo pinfo = modelManager->projectInfo(this);
CPlusPlus::CppModelManagerInterface::ProjectInfo pinfo = modelManager->projectInfo(this);
pinfo.defines = predefinedMacros;
pinfo.defines += '\n';
pinfo.defines += m_defines;