CppTools/Clang: Clean-up of includes

Change-Id: I0ba340dcf0ee23e61588f17262d07e7088751836
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>

18 files changed, 22 insertions, 32 deletions

diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
index 0e664aee80..81b39455e7 100644
--- a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
@@ -40,6 +40,7 @@
 
 #include <cpptools/abstracteditorsupport.h>
 #include <cpptools/baseeditordocumentprocessor.h>
+#include <cpptools/cppmodelmanager.h>
 #include <cpptools/editordocumenthandle.h>
 
 #include <texteditor/codeassist/functionhintproposal.h>
diff --git a/src/plugins/clangcodemodel/clangcompletionassistinterface.cpp b/src/plugins/clangcodemodel/clangcompletionassistinterface.cpp
index b8fbb2f4bc..f549cd8e4d 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistinterface.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionassistinterface.cpp
@@ -30,10 +30,6 @@
 
 #include "clangcompletionassistinterface.h"
 
-#include "clangutils.h"
-
-#include <cpptools/cpptoolsreuse.h>
-
 #include <texteditor/texteditor.h>
 
 namespace ClangCodeModel {
diff --git a/src/plugins/clangcodemodel/clangcompletionassistinterface.h b/src/plugins/clangcodemodel/clangcompletionassistinterface.h
index 11bd0d7ddd..7be7f1431a 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistinterface.h
+++ b/src/plugins/clangcodemodel/clangcompletionassistinterface.h
@@ -34,8 +34,6 @@
 #include "clangbackendipcintegration.h"
 #include "clangutils.h"
 
-#include <cpptools/cppcompletionassistprovider.h>
-
 #include <texteditor/codeassist/assistinterface.h>
 
 namespace ClangCodeModel {
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
index 0cd362d4da..ded48db494 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 <utils/qtcassert.h>
-
+#include <cpptools/cppdoxygen.h>
+#include <cpptools/cppmodelmanager.h>
 #include <cpptools/editordocumenthandle.h>
 
 #include <texteditor/codeassist/assistproposalitem.h>
@@ -49,17 +48,16 @@
 #include <texteditor/codeassist/ifunctionhintproposalmodel.h>
 #include <texteditor/convenience.h>
 
-#include <cpptools/cppdoxygen.h>
-
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cplusplus/SimpleLexer.h>
 
-#include <QDirIterator>
-#include <QTextBlock>
-#include <filecontainer.h>
+#include <clangbackendipc/filecontainer.h>
 
 #include <utils/mimetypes/mimedatabase.h>
+#include <utils/qtcassert.h>
+
+#include <QDirIterator>
 
 namespace ClangCodeModel {
 namespace Internal {
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h
index 6a8abddcb7..f4aee3618d 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h
+++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h
@@ -34,11 +34,10 @@
 #include "clangcompletionassistinterface.h"
 
 #include <cpptools/cppcompletionassistprocessor.h>
-#include <texteditor/texteditor.h>
 
 #include <clangbackendipc/codecompletion.h>
 
-#include <QCoreApplication>
+#include <QTextCursor>
 
 namespace ClangCodeModel {
 namespace Internal {
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index eb5e6fe199..b15e8470a0 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -40,6 +40,7 @@
 #include <sourcelocationcontainer.h>
 
 #include <cpptools/cppcodemodelsettings.h>
+#include <cpptools/cppmodelmanager.h>
 #include <cpptools/cppprojects.h>
 #include <cpptools/cpptoolsreuse.h>
 #include <cpptools/cppworkingcopy.h>
diff --git a/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp b/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp
index 4b6238e0a3..e262658136 100644
--- a/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp
+++ b/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp
@@ -32,10 +32,6 @@
 
 #include "clangfixitoperation.h"
 
-#include <clangbackendipc/sourcerangecontainer.h>
-
-#include <utils/qtcassert.h>
-
 #include <QDebug>
 
 using ClangBackEnd::DiagnosticContainer;
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 3b5384b20b..0154366990 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -35,8 +35,9 @@
 #include "clangutils.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <cpptools/baseeditordocumentparser.h>
+#include <cpptools/cppmodelmanager.h>
 #include <cpptools/editordocumenthandle.h>
+#include <texteditor/quickfix.h>
 #include <projectexplorer/project.h>
 
 #include <clangbackendipc/cmbregisterprojectsforeditormessage.h>
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index 01fafd9e24..10735cfef3 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -35,7 +35,6 @@
 #include <coreplugin/coreicons.h>
 
 #include <QString>
-#include <QApplication>
 
 namespace ClangCodeModel {
 
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index ca2b07c292..9975d09346 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -35,6 +35,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <cpptools/baseeditordocumentparser.h>
+#include <cpptools/cppmodelmanager.h>
 #include <cpptools/cppprojects.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/cpptools/baseeditordocumentparser.cpp b/src/plugins/cpptools/baseeditordocumentparser.cpp
index 006c998472..c4e27df2a0 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 d1d0608ec3..4d0c74f4f2 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 <QObject>
+#include <QMutex>
 
 namespace CppTools {
 
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp
index 33e9887756..d79ef7e795 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 <texteditor/fontsettings.h>
+#include <texteditor/quickfix.h>
 #include <texteditor/texteditorsettings.h>
 
 #include <utils/qtcassert.h>
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h
index 19e7566659..eb3b322ecd 100644
--- a/src/plugins/cpptools/baseeditordocumentprocessor.h
+++ b/src/plugins/cpptools/baseeditordocumentprocessor.h
@@ -38,13 +38,15 @@
 #include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/textdocument.h>
-#include <texteditor/quickfix.h>
 
 #include <cplusplus/CppDocument.h>
 
 #include <QTextEdit>
 
-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 df5b1158f0..164745d4cf 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 <projectexplorer/projectexplorerconstants.h>
 
diff --git a/src/plugins/cpptools/builtineditordocumentparser.h b/src/plugins/cpptools/builtineditordocumentparser.h
index 9fd198024c..8c7c9400ea 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 <cplusplus/CppDocument.h>
 
diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
index 689d92ca76..f1e11b6375 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
@@ -37,7 +37,6 @@
 #include "cpptoolsreuse.h"
 #include "cppworkingcopy.h"
 
-#include <texteditor/texteditor.h>
 #include <texteditor/convenience.h>
 
 #include <cplusplus/CppDocument.h>
diff --git a/src/plugins/cpptools/semantichighlighter.cpp b/src/plugins/cpptools/semantichighlighter.cpp
index c7e93f944e..cb2a34eb1d 100644
--- a/src/plugins/cpptools/semantichighlighter.cpp
+++ b/src/plugins/cpptools/semantichighlighter.cpp
@@ -29,9 +29,9 @@
 ****************************************************************************/
 
 #include "semantichighlighter.h"
-#include "cppsemanticinfo.h"
 
 #include <texteditor/fontsettings.h>
+#include <texteditor/semantichighlighter.h>
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/textdocument.h>
 
@@ -40,7 +40,6 @@
 #include <QLoggingCategory>
 #include <QTextDocument>
 
-using namespace CPlusPlus;
 using TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats;
 using TextEditor::SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd;