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

Move CanonicalSymbol from CppEditor to CppTools

Browse Source 
Needed for a follow-up change.

Change-Id: Ibb4815f3411f0d63deac8c32583178470668f67b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Nikolai Kosjar
2017-05-23 15:38:16 +02:00
parent d84a6ed411
commit 6174cca5a0
8 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppuseselectionsupdater.cpp
View File

@@ -25,9 +25,9 @@
#include "cppuseselectionsupdater.h"
#include "cppcanonicalsymbol.h"
#include "cppeditor.h"
#include <cpptools/cppcanonicalsymbol.h>
#include <cpptools/cpplocalsymbols.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cpptoolsreuse.h>
@@ -125,7 +125,7 @@ public:
{
TextEditor::Convenience::convertPosition(textCursor.document(), textCursor.position(),
&line, &column);
CppEditor::Internal::CanonicalSymbol canonicalSymbol(document, snapshot);
CppTools::CanonicalSymbol canonicalSymbol(document, snapshot);
scope = canonicalSymbol.getScopeAndExpression(textCursor, &expression);
}
@@ -199,7 +199,7 @@ QList<int> findReferences(const Params &p)
typeOfExpression.init(p.document, snapshot);
typeOfExpression.setExpandTemplates(true);
using CppEditor::Internal::CanonicalSymbol;
using CppTools::CanonicalSymbol;
if (Symbol *s = CanonicalSymbol::canonicalSymbol(p.scope, p.expression, typeOfExpression)) {
CppTools::CppModelManager *mmi = CppTools::CppModelManager::instance();
result = mmi->references(s, typeOfExpression.context());