CppTools/Clang: Clean-up of includes

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

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>

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 {

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 {

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 {

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 {

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>

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;

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>

src/plugins/clangcodemodel/clangtextmark.cpp

@@ -35,7 +35,6 @@
 #include <coreplugin/coreicons.h>
 
 #include <QString>
-#include <QApplication>
 
 namespace ClangCodeModel {
 

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>

src/plugins/cpptools/baseeditordocumentparser.cpp

@@ -31,6 +31,7 @@
 #include "baseeditordocumentparser.h"
 #include "baseeditordocumentprocessor.h"
 
+#include "cppmodelmanager.h"
 #include "cpptoolsreuse.h"
 #include "editordocumenthandle.h"
 

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 {
 

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>

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 {
 

src/plugins/cpptools/builtineditordocumentparser.cpp

@@ -30,7 +30,6 @@
 
 #include "builtineditordocumentparser.h"
 #include "cppsourceprocessor.h"
-#include "editordocumenthandle.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 

src/plugins/cpptools/builtineditordocumentparser.h

@@ -33,7 +33,6 @@
 
 #include "baseeditordocumentparser.h"
 #include "cpptools_global.h"
-#include "cppmodelmanager.h"
 
 #include <cplusplus/CppDocument.h>
 

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>

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;