CppTools/Clang: Clean-up of includes

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

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;