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

10
src/plugins/debugger/watchutils.cpp
View File

@@ -46,9 +46,10 @@
#include <texteditor/texteditorconstants.h>
#include <coreplugin/editormanager/editormanager.h>
#include <cpptools/cppmodelmanagerinterface.h>
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/abstracteditorsupport.h>
#include <cplusplus/ModelManagerInterface.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/Overview.h>
#include <Symbols.h>
@@ -709,13 +710,13 @@ bool currentTextEditorPosition(QString *fileNameIn /* = 0 */,
return !fileName.isEmpty();
}
static CppTools::CppModelManagerInterface *cppModelManager()
static CPlusPlus::CppModelManagerInterface *cppModelManager()
{
using namespace CppTools;
using namespace CPlusPlus;
static QPointer<CppModelManagerInterface> modelManager;
if (!modelManager.data())
modelManager = ExtensionSystem::PluginManager::instance()->
getObject<CppTools::CppModelManagerInterface>();
getObject<CPlusPlus::CppModelManagerInterface>();
return modelManager.data();
}
@@ -724,6 +725,7 @@ QString cppExpressionAt(TextEditor::ITextEditor *editor, int pos,
int *line, int *column, QString *function /* = 0 */)
{
using namespace CppTools;
using namespace CPlusPlus;
*line = *column = 0;
if (function)
function->clear();