diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri index b1e27c950e89d3c30adbc44645c227a18323c81c..24bb51cf5e2c9216b00754d32d2b5cf2d9a506a5 100644 --- a/src/libs/cplusplus/cplusplus-lib.pri +++ b/src/libs/cplusplus/cplusplus-lib.pri @@ -38,7 +38,6 @@ HEADERS += \ $$PWD/ASTPath.h \ $$PWD/DeprecatedGenTemplateInstance.h \ $$PWD/FindUsages.h \ - $$PWD/CheckUndefinedSymbols.h \ $$PWD/DependencyTable.h \ $$PWD/PreprocessorClient.h \ $$PWD/PreprocessorEnvironment.h \ @@ -64,7 +63,6 @@ SOURCES += \ $$PWD/ASTPath.cpp \ $$PWD/DeprecatedGenTemplateInstance.cpp \ $$PWD/FindUsages.cpp \ - $$PWD/CheckUndefinedSymbols.cpp \ $$PWD/DependencyTable.cpp \ $$PWD/PreprocessorClient.cpp \ $$PWD/PreprocessorEnvironment.cpp \ diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.cpp b/src/plugins/cppeditor/cppcheckundefinedsymbols.cpp similarity index 99% rename from src/libs/cplusplus/CheckUndefinedSymbols.cpp rename to src/plugins/cppeditor/cppcheckundefinedsymbols.cpp index 10fb5dc7e65194179bbe83a24b42ec2b0e1bc756..d5f8e3337aac0982858fae20d5850bdc8360a835 100644 --- a/src/libs/cplusplus/CheckUndefinedSymbols.cpp +++ b/src/plugins/cppeditor/cppcheckundefinedsymbols.cpp @@ -27,8 +27,8 @@ ** **************************************************************************/ -#include "CheckUndefinedSymbols.h" -#include "Overview.h" +#include "cppcheckundefinedsymbols.h" +#include <cplusplus/Overview.h> #include <Names.h> #include <Literals.h> diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.h b/src/plugins/cppeditor/cppcheckundefinedsymbols.h similarity index 96% rename from src/libs/cplusplus/CheckUndefinedSymbols.h rename to src/plugins/cppeditor/cppcheckundefinedsymbols.h index fd5ffbc78610a1804fe2f77d5869d845f78ef88b..e4dd960f50340b05380388946662f19a9ef4d966 100644 --- a/src/libs/cplusplus/CheckUndefinedSymbols.h +++ b/src/plugins/cppeditor/cppcheckundefinedsymbols.h @@ -30,14 +30,14 @@ #ifndef CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H #define CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H -#include "CppDocument.h" -#include "LookupContext.h" +#include <cplusplus/CppDocument.h> +#include <cplusplus/LookupContext.h> #include <ASTVisitor.h> #include <QtCore/QSet> namespace CPlusPlus { -class CPLUSPLUS_EXPORT CheckUndefinedSymbols: protected ASTVisitor +class CheckUndefinedSymbols: protected ASTVisitor { public: CheckUndefinedSymbols(TranslationUnit *unit, const LookupContext &context); diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index fc7b9f3a668a91b5e7b136f8a0c9d21cf1794718..bb89ca7187da7d80f4b5445c0856531ecce99167 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -31,6 +31,8 @@ #include "cppeditorconstants.h" #include "cppplugin.h" #include "cpphighlighter.h" +#include "cppcheckundefinedsymbols.h" + #include "cppquickfix.h" #include <cpptools/cpptoolsplugin.h> @@ -54,7 +56,6 @@ #include <cplusplus/MatchingText.h> #include <cplusplus/BackwardsScanner.h> #include <cplusplus/FastPreprocessor.h> -#include <cplusplus/CheckUndefinedSymbols.h> #include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cpptoolsconstants.h> diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index 8e3b022e4bff4282232d906e245ba96c783ed8f8..0fbfba07811ed9628e3cd9640863b9b5b2e80a33 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -15,7 +15,8 @@ HEADERS += cppplugin.h \ cppeditor_global.h \ cppclasswizard.h \ cppquickfix.h \ - cpprefactoringchanges.h + cpprefactoringchanges.h \ + cppcheckundefinedsymbols.h SOURCES += cppplugin.cpp \ cppeditor.cpp \ @@ -24,7 +25,8 @@ SOURCES += cppplugin.cpp \ cppfilewizard.cpp \ cppclasswizard.cpp \ cppquickfix.cpp \ - cpprefactoringchanges.cpp + cpprefactoringchanges.cpp \ + cppcheckundefinedsymbols.cpp RESOURCES += cppeditor.qrc diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 317fba77d81356dfe0d1f756e237816b6e50942a..486eabb51f028eb93ef74973a86dc37c14cf0723 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -29,7 +29,6 @@ #include <cplusplus/pp.h> #include <cplusplus/Overview.h> -#include <cplusplus/CheckUndefinedSymbols.h> #include "cppmodelmanager.h" #ifndef ICHECK_BUILD diff --git a/src/shared/cplusplus/Symbols.h b/src/shared/cplusplus/Symbols.h index 46be950121c490754e79440a08e743182ef047f5..2a90fd0cc0306b5712e4f9385fea450129a1d67b 100644 --- a/src/shared/cplusplus/Symbols.h +++ b/src/shared/cplusplus/Symbols.h @@ -57,7 +57,7 @@ namespace CPlusPlus { -class TemplateParameters +class CPLUSPLUS_EXPORT TemplateParameters { public: TemplateParameters(Scope *scope);