From ca6335938600376ec235d2510a8975127cc34a44 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 15 Dec 2015 11:59:48 +0100 Subject: [PATCH] CppTools/Clang: Clean-up of includes Change-Id: I0ba340dcf0ee23e61588f17262d07e7088751836 Reviewed-by: Marco Bubke --- .../clangcodemodel/clangbackendipcintegration.cpp | 1 + .../clangcompletionassistinterface.cpp | 4 ---- .../clangcompletionassistinterface.h | 2 -- .../clangcompletionassistprocessor.cpp | 14 ++++++-------- .../clangcompletionassistprocessor.h | 3 +-- .../clangeditordocumentprocessor.cpp | 1 + .../clangfixitoperationsextractor.cpp | 4 ---- .../clangcodemodel/clangmodelmanagersupport.cpp | 3 ++- src/plugins/clangcodemodel/clangtextmark.cpp | 1 - src/plugins/clangcodemodel/clangutils.cpp | 1 + src/plugins/cpptools/baseeditordocumentparser.cpp | 1 + src/plugins/cpptools/baseeditordocumentparser.h | 3 ++- .../cpptools/baseeditordocumentprocessor.cpp | 4 ++-- src/plugins/cpptools/baseeditordocumentprocessor.h | 6 ++++-- .../cpptools/builtineditordocumentparser.cpp | 1 - src/plugins/cpptools/builtineditordocumentparser.h | 1 - .../cpptools/builtineditordocumentprocessor.cpp | 1 - src/plugins/cpptools/semantichighlighter.cpp | 3 +-- 18 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp index 0e664aee807..81b39455e7e 100644 --- a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp +++ b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp @@ -40,6 +40,7 @@ #include #include +#include #include #include diff --git a/src/plugins/clangcodemodel/clangcompletionassistinterface.cpp b/src/plugins/clangcodemodel/clangcompletionassistinterface.cpp index b8fbb2f4bc7..f549cd8e4d9 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistinterface.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistinterface.cpp @@ -30,10 +30,6 @@ #include "clangcompletionassistinterface.h" -#include "clangutils.h" - -#include - #include namespace ClangCodeModel { diff --git a/src/plugins/clangcodemodel/clangcompletionassistinterface.h b/src/plugins/clangcodemodel/clangcompletionassistinterface.h index 11bd0d7ddd9..7be7f1431a7 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistinterface.h +++ b/src/plugins/clangcodemodel/clangcompletionassistinterface.h @@ -34,8 +34,6 @@ #include "clangbackendipcintegration.h" #include "clangutils.h" -#include - #include namespace ClangCodeModel { diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index 0cd362d4da2..ded48db4945 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -37,11 +37,10 @@ #include "clangcompletioncontextanalyzer.h" #include "clangeditordocumentprocessor.h" #include "clangfunctionhintmodel.h" -#include "clangutils.h" #include "clangcompletionchunkstotextconverter.h" -#include - +#include +#include #include #include @@ -49,17 +48,16 @@ #include #include -#include - #include #include #include -#include -#include -#include +#include #include +#include + +#include namespace ClangCodeModel { namespace Internal { diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h index 6a8abddcb71..f4aee3618d0 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h @@ -34,11 +34,10 @@ #include "clangcompletionassistinterface.h" #include -#include #include -#include +#include namespace ClangCodeModel { namespace Internal { diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp index eb5e6fe199c..b15e8470a03 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -40,6 +40,7 @@ #include #include +#include #include #include #include diff --git a/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp b/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp index 4b6238e0a33..e262658136b 100644 --- a/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp +++ b/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp @@ -32,10 +32,6 @@ #include "clangfixitoperation.h" -#include - -#include - #include using ClangBackEnd::DiagnosticContainer; diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index 3b5384b20b2..0154366990a 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -35,8 +35,9 @@ #include "clangutils.h" #include -#include +#include #include +#include #include #include diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp index 01fafd9e24f..10735cfef35 100644 --- a/src/plugins/clangcodemodel/clangtextmark.cpp +++ b/src/plugins/clangcodemodel/clangtextmark.cpp @@ -35,7 +35,6 @@ #include #include -#include namespace ClangCodeModel { diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index ca2b07c2927..9975d093467 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include diff --git a/src/plugins/cpptools/baseeditordocumentparser.cpp b/src/plugins/cpptools/baseeditordocumentparser.cpp index 006c998472f..c4e27df2a07 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.cpp +++ b/src/plugins/cpptools/baseeditordocumentparser.cpp @@ -31,6 +31,7 @@ #include "baseeditordocumentparser.h" #include "baseeditordocumentprocessor.h" +#include "cppmodelmanager.h" #include "cpptoolsreuse.h" #include "editordocumenthandle.h" diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h index d1d0608ec3b..4d0c74f4f2f 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.h +++ b/src/plugins/cpptools/baseeditordocumentparser.h @@ -31,11 +31,12 @@ #ifndef BASEEDITORDOCUMENTPARSER_H #define BASEEDITORDOCUMENTPARSER_H -#include "cppmodelmanager.h" #include "cpptools_global.h" +#include "cppprojects.h" #include "cppworkingcopy.h" #include +#include namespace CppTools { diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp index 33e9887756e..d79ef7e7952 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp +++ b/src/plugins/cpptools/baseeditordocumentprocessor.cpp @@ -29,12 +29,12 @@ ****************************************************************************/ #include "baseeditordocumentprocessor.h" -#include "cppworkingcopy.h" -#include "cpptoolsreuse.h" +#include "cppmodelmanager.h" #include "editordocumenthandle.h" #include +#include #include #include diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h index 19e75666595..eb3b322ecd0 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.h +++ b/src/plugins/cpptools/baseeditordocumentprocessor.h @@ -38,13 +38,15 @@ #include #include #include -#include #include #include -namespace TextEditor { class TextDocument; } +namespace TextEditor { +class TextDocument; +class QuickFixOperations; +} namespace CppTools { diff --git a/src/plugins/cpptools/builtineditordocumentparser.cpp b/src/plugins/cpptools/builtineditordocumentparser.cpp index df5b1158f04..164745d4cf2 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.cpp +++ b/src/plugins/cpptools/builtineditordocumentparser.cpp @@ -30,7 +30,6 @@ #include "builtineditordocumentparser.h" #include "cppsourceprocessor.h" -#include "editordocumenthandle.h" #include diff --git a/src/plugins/cpptools/builtineditordocumentparser.h b/src/plugins/cpptools/builtineditordocumentparser.h index 9fd198024c3..8c7c9400eae 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.h +++ b/src/plugins/cpptools/builtineditordocumentparser.h @@ -33,7 +33,6 @@ #include "baseeditordocumentparser.h" #include "cpptools_global.h" -#include "cppmodelmanager.h" #include diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp index 689d92ca760..f1e11b63755 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp +++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp @@ -37,7 +37,6 @@ #include "cpptoolsreuse.h" #include "cppworkingcopy.h" -#include #include #include diff --git a/src/plugins/cpptools/semantichighlighter.cpp b/src/plugins/cpptools/semantichighlighter.cpp index c7e93f944ef..cb2a34eb1d2 100644 --- a/src/plugins/cpptools/semantichighlighter.cpp +++ b/src/plugins/cpptools/semantichighlighter.cpp @@ -29,9 +29,9 @@ ****************************************************************************/ #include "semantichighlighter.h" -#include "cppsemanticinfo.h" #include +#include #include #include @@ -40,7 +40,6 @@ #include #include -using namespace CPlusPlus; using TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats; using TextEditor::SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd;