From 6174cca5a09f2dba320280e60211702cdb830172 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 23 May 2017 15:38:16 +0200 Subject: [PATCH] Move CanonicalSymbol from CppEditor to CppTools Needed for a follow-up change. Change-Id: Ibb4815f3411f0d63deac8c32583178470668f67b Reviewed-by: Ivan Donchevskii Reviewed-by: Orgad Shaneh --- src/plugins/cppeditor/cppeditor.cpp | 2 +- src/plugins/cppeditor/cppeditor.pro | 2 -- src/plugins/cppeditor/cppeditor.qbs | 2 -- src/plugins/cppeditor/cppuseselectionsupdater.cpp | 6 +++--- .../{cppeditor => cpptools}/cppcanonicalsymbol.cpp | 4 +--- .../{cppeditor => cpptools}/cppcanonicalsymbol.h | 10 +++++----- src/plugins/cpptools/cpptools.pro | 2 ++ src/plugins/cpptools/cpptools.qbs | 2 ++ 8 files changed, 14 insertions(+), 16 deletions(-) rename src/plugins/{cppeditor => cpptools}/cppcanonicalsymbol.cpp (98%) rename src/plugins/{cppeditor => cpptools}/cppcanonicalsymbol.h (94%) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 4503b3c77dd..ded91d5b8f6 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -26,7 +26,6 @@ #include "cppeditor.h" #include "cppautocompleter.h" -#include "cppcanonicalsymbol.h" #include "cppdocumentationcommenthelper.h" #include "cppeditorconstants.h" #include "cppeditordocument.h" @@ -47,6 +46,7 @@ #include #include +#include #include #include #include diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index a9f94bd8651..8efb3cd4f0d 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -3,7 +3,6 @@ include(../../qtcreatorplugin.pri) HEADERS += \ cppautocompleter.h \ - cppcanonicalsymbol.h \ cppcodemodelinspectordialog.h \ cppdocumentationcommenthelper.h \ cppeditor.h \ @@ -35,7 +34,6 @@ HEADERS += \ SOURCES += \ cppautocompleter.cpp \ - cppcanonicalsymbol.cpp \ cppcodemodelinspectordialog.cpp \ cppdocumentationcommenthelper.cpp \ cppeditor.cpp \ diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 1117b0f8a17..32a403ea4c7 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -22,8 +22,6 @@ QtcPlugin { files: [ "cppautocompleter.cpp", "cppautocompleter.h", - "cppcanonicalsymbol.cpp", - "cppcanonicalsymbol.h", "cppcodemodelinspectordialog.cpp", "cppcodemodelinspectordialog.h", "cppcodemodelinspectordialog.ui", diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.cpp b/src/plugins/cppeditor/cppuseselectionsupdater.cpp index d7c6b8aba42..1152ada8fff 100644 --- a/src/plugins/cppeditor/cppuseselectionsupdater.cpp +++ b/src/plugins/cppeditor/cppuseselectionsupdater.cpp @@ -25,9 +25,9 @@ #include "cppuseselectionsupdater.h" -#include "cppcanonicalsymbol.h" #include "cppeditor.h" +#include #include #include #include @@ -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 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()); diff --git a/src/plugins/cppeditor/cppcanonicalsymbol.cpp b/src/plugins/cpptools/cppcanonicalsymbol.cpp similarity index 98% rename from src/plugins/cppeditor/cppcanonicalsymbol.cpp rename to src/plugins/cpptools/cppcanonicalsymbol.cpp index 87e1b6a7fd0..0532ae8b2d2 100644 --- a/src/plugins/cppeditor/cppcanonicalsymbol.cpp +++ b/src/plugins/cpptools/cppcanonicalsymbol.cpp @@ -35,8 +35,7 @@ using namespace CPlusPlus; -namespace CppEditor { -namespace Internal { +namespace CppTools { CanonicalSymbol::CanonicalSymbol(const Document::Ptr &document, const Snapshot &snapshot) @@ -129,5 +128,4 @@ Symbol *CanonicalSymbol::canonicalSymbol(Scope *scope, const QString &code, return 0; } -} // namespace Internal } // namespace CppEditor diff --git a/src/plugins/cppeditor/cppcanonicalsymbol.h b/src/plugins/cpptools/cppcanonicalsymbol.h similarity index 94% rename from src/plugins/cppeditor/cppcanonicalsymbol.h rename to src/plugins/cpptools/cppcanonicalsymbol.h index 293859e9a54..3ef9febd952 100644 --- a/src/plugins/cppeditor/cppcanonicalsymbol.h +++ b/src/plugins/cpptools/cppcanonicalsymbol.h @@ -25,16 +25,17 @@ #pragma once +#include "cpptools_global.h" + #include #include #include QT_FORWARD_DECLARE_CLASS(QTextCursor) -namespace CppEditor { -namespace Internal { +namespace CppTools { -class CanonicalSymbol +class CPPTOOLS_EXPORT CanonicalSymbol { public: CanonicalSymbol(const CPlusPlus::Document::Ptr &document, @@ -58,5 +59,4 @@ private: CPlusPlus::TypeOfExpression m_typeOfExpression; }; -} // namespace Internal -} // namespace CppEditor +} // namespace CppTools diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index 3fffe2dfd3d..142cfea6614 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -12,6 +12,7 @@ HEADERS += \ clangdiagnosticconfig.h \ clangdiagnosticconfigsmodel.h \ clangdiagnosticconfigswidget.h \ + cppcanonicalsymbol.h \ cppchecksymbols.h \ cppclassesfilter.h \ cppcodeformatter.h \ @@ -95,6 +96,7 @@ SOURCES += \ clangdiagnosticconfig.cpp \ clangdiagnosticconfigsmodel.cpp \ clangdiagnosticconfigswidget.cpp \ + cppcanonicalsymbol.cpp \ cppchecksymbols.cpp \ cppclassesfilter.cpp \ cppcodeformatter.cpp \ diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index 6bfb639c5ef..dfff98906a6 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -51,6 +51,8 @@ Project { "clangdiagnosticconfigswidget.ui", "compileroptionsbuilder.cpp", "compileroptionsbuilder.h", + "cppcanonicalsymbol.cpp", + "cppcanonicalsymbol.h", "cppchecksymbols.cpp", "cppchecksymbols.h", "cppclassesfilter.cpp",