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

debugger: reduce the number of PluginManager::getObject() calls

Browse Source
This commit is contained in:
hjk
2010-12-21 13:58:13 +01:00
parent 63eaf1e132
commit 3f98fb7f63
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -709,6 +709,16 @@ bool currentTextEditorPosition(QString *fileNameIn /* = 0 */,
return !fileName.isEmpty();
}
static CppTools::CppModelManagerInterface *cppModelManager()
{
using namespace CppTools;
static QPointer<CppModelManagerInterface> modelManager;
if (!modelManager.data())
modelManager = ExtensionSystem::PluginManager::instance()->
getObject<CppTools::CppModelManagerInterface>();
return modelManager.data();
}
// Return the Cpp expression, and, if desired, the function
QString cppExpressionAt(TextEditor::ITextEditor *editor, int pos,
int *line, int *column, QString *function /* = 0 */)
@@ -723,9 +733,7 @@ QString cppExpressionAt(TextEditor::ITextEditor *editor, int pos,
return QByteArray();
QString expr = plaintext->textCursor().selectedText();
CppModelManagerInterface *modelManager =
ExtensionSystem::PluginManager::instance()->
getObject<CppTools::CppModelManagerInterface>();
CppModelManagerInterface *modelManager = cppModelManager();
if (expr.isEmpty() && modelManager) {
QTextCursor tc(plaintext->document());
tc.setPosition(pos);