Clean exported headers of the CppTools plugin.

Change-Id: I0144ac33e88980c431c54a6d69bbde28da4b1967
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/cppeditor/cppelementevaluator.cpp

@@ -30,6 +30,7 @@
 
 #include "cppelementevaluator.h"
 
+#include <cpptools/cppmodelmanager.h>
 #include <cpptools/cpptoolsreuse.h>
 #include <cpptools/typehierarchybuilder.h>
 

src/plugins/cppeditor/cppelementevaluator.h

@@ -35,6 +35,8 @@
 #include <texteditor/texteditor.h>
 #include <texteditor/helpitem.h>
 
+#include <cplusplus/CppDocument.h>
+
 #include <QString>
 #include <QStringList>
 #include <QSharedPointer>

src/plugins/cppeditor/cppfunctiondecldeflink.cpp

@@ -43,6 +43,7 @@
 
 #include <cplusplus/ASTPath.h>
 #include <cplusplus/CppRewriter.h>
+#include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
 
 #include <utils/proxyaction.h>

src/plugins/cppeditor/cppquickfix_test.h

@@ -30,6 +30,8 @@
 
 #include "cppeditortestcase.h"
 
+#include <cpptools/cppprojects.h>
+
 #include <QByteArray>
 #include <QList>
 #include <QSharedPointer>

src/plugins/cppeditor/cppquickfixassistant.cpp

@@ -33,6 +33,7 @@
 #include "cppeditorconstants.h"
 #include "cppeditor.h"
 
+#include <cpptools/cppmodelmanager.h>
 #include <texteditor/textdocument.h>
 
 #include <cplusplus/ASTPath.h>

src/plugins/cpptools/baseeditordocumentparser.cpp

@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "baseeditordocumentparser.h"
+#include "baseeditordocumentprocessor.h"
 
 #include "editordocumenthandle.h"
 

src/plugins/cpptools/builtinindexingsupport.cpp

@@ -40,6 +40,7 @@
 #include "searchsymbols.h"
 
 #include <coreplugin/icore.h>
+#include <coreplugin/find/searchresultwindow.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
 #include <cplusplus/LookupContext.h>
@@ -47,6 +48,7 @@
 #include <utils/runextensions.h>
 
 #include <QCoreApplication>
+#include <QDir>
 #include <QElapsedTimer>
 
 using namespace CppTools;

src/plugins/cpptools/cppclassesfilter.h

@@ -32,11 +32,11 @@
 #define CPPCLASSESFILTER_H
 
 #include "cpptools_global.h"
-#include "cpplocatordata.h"
 #include "cpplocatorfilter.h"
 
 
 namespace CppTools {
+class CppLocatorData;
 
 // TODO: un-export this
 class CPPTOOLS_EXPORT CppClassesFilter : public Internal::CppLocatorFilter

src/plugins/cpptools/cppcodeformatter.h

@@ -36,7 +36,6 @@
 
 #include <texteditor/tabsettings.h>
 
-#include <cplusplus/Token.h>
 #include <cplusplus/SimpleLexer.h>
 
 #include <QStack>

src/plugins/cpptools/cppcodemodelinspectordumper.cpp

@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "cppcodemodelinspectordumper.h"
+#include "cppmodelmanager.h"
 
 #include "cppworkingcopy.h"
 

src/plugins/cpptools/cppcodemodelinspectordumper.h

@@ -33,13 +33,15 @@
 
 #include "cpptools_global.h"
 
-#include <cpptools/cppmodelmanager.h>
+#include <cpptools/cppprojects.h>
 #include <cplusplus/CppDocument.h>
 
 #include <QFile>
 #include <QTextStream>
 
 namespace CppTools {
+class WorkingCopy;
+
 namespace CppCodeModelInspector {
 
 struct CPPTOOLS_EXPORT Utils

src/plugins/cpptools/cppcodestylesettings.cpp

@@ -38,6 +38,8 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projecttree.h>
 
+#include <cplusplus/Overview.h>
+
 #include <utils/qtcassert.h>
 #include <utils/settingsutils.h>
 

src/plugins/cpptools/cppcodestylesettings.h

@@ -33,14 +33,14 @@
 
 #include "cpptools_global.h"
 
-#include <cplusplus/Overview.h>
-
-#include <QVariant>
+#include <QVariantMap>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
 
+namespace CPlusPlus { class Overview; }
+
 namespace CppTools {
 
 class CPPTOOLS_EXPORT CppCodeStyleSettings

src/plugins/cpptools/cppcodestylesettingspage.cpp

@@ -45,6 +45,7 @@
 #include <texteditor/snippets/isnippetprovider.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <cplusplus/Overview.h>
 #include <cplusplus/pp.h>
 
 #include <extensionsystem/pluginmanager.h>

src/plugins/cpptools/cppcompletionassist.cpp

@@ -59,6 +59,7 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/ResolveExpression.h>
 
+#include <QDirIterator>
 #include <QLatin1String>
 #include <QTextCursor>
 #include <QTextDocument>

src/plugins/cpptools/cppcompletionassistprovider.h

@@ -36,12 +36,12 @@
 #include <texteditor/codeassist/assistenums.h>
 #include <texteditor/codeassist/completionassistprovider.h>
 
-#include <cplusplus/Token.h>
-
 QT_BEGIN_NAMESPACE
 class QTextDocument;
 QT_END_NAMESPACE
 
+namespace CPlusPlus { struct LanguageFeatures; }
+
 namespace TextEditor {
 class BaseTextEditor;
 class AssistInterface;

src/plugins/cpptools/cppcurrentdocumentfilter.cpp

@@ -32,8 +32,9 @@
 
 #include "cppmodelmanager.h"
 
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/idocument.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <QStringMatcher>
 

src/plugins/cpptools/cppincludesfilter.cpp

@@ -34,6 +34,7 @@
 
 #include <cplusplus/CppDocument.h>
 #include <coreplugin/editormanager/documentmodel.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 

src/plugins/cpptools/cppindexingsupport.h

@@ -35,12 +35,13 @@
 
 #include "cppmodelmanager.h"
 
-#include <coreplugin/find/searchresultwindow.h>
 #include <coreplugin/find/textfindconstants.h>
 
 #include <QFuture>
 #include <QStringList>
 
+namespace Core { class SearchResultItem; }
+
 namespace CppTools {
 
 class CPPTOOLS_EXPORT SymbolSearcher: public QObject

src/plugins/cpptools/cppmodelmanager.cpp

@@ -31,6 +31,7 @@
 #include "cppmodelmanager.h"
 
 #include "abstracteditorsupport.h"
+#include "baseeditordocumentprocessor.h"
 #include "builtinindexingsupport.h"
 #include "cppcodemodelinspectordumper.h"
 #include "cppcodemodelsettings.h"
@@ -48,6 +49,7 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/textdocument.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <extensionsystem/pluginmanager.h>
@@ -56,6 +58,7 @@
 
 #include <QCoreApplication>
 #include <QDebug>
+#include <QDir>
 #include <QMutexLocker>
 #include <QTextBlock>
 #include <QTimer>

src/plugins/cpptools/cppmodelmanager.h

@@ -35,10 +35,6 @@
 
 #include "cppprojects.h"
 
-#include <projectexplorer/project.h>
-#include <texteditor/texteditor.h>
-
-#include <cplusplus/CppDocument.h>
 #include <cplusplus/cppmodelmanagerbase.h>
 
 #include <QFuture>

src/plugins/cpptools/cppmodelmanager_test.cpp

@@ -28,6 +28,7 @@
 **
 ****************************************************************************/
 
+#include "baseeditordocumentprocessor.h"
 #include "builtineditordocumentparser.h"
 #include "cppsourceprocessor.h"
 #include "cpptoolsplugin.h"

src/plugins/cpptools/cpppointerdeclarationformatter.cpp

@@ -31,6 +31,9 @@
 
 #include "cpppointerdeclarationformatter.h"
 
+#include <cplusplus/Overview.h>
+
+#include <QDebug>
 #include <QTextCursor>
 
 #define DEBUG_OUTPUT 0

src/plugins/cpptools/cpppointerdeclarationformatter.h

@@ -34,7 +34,11 @@
 #include "cpptools_global.h"
 #include "cpprefactoringchanges.h"
 
-#include <cplusplus/Overview.h>
+#include <cplusplus/ASTVisitor.h>
+
+#include <utils/changeset.h>
+
+namespace CPlusPlus { class Overview; }
 
 namespace CppTools {
 

src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp

@@ -41,6 +41,7 @@
 
 #include <utils/fileutils.h>
 
+#include <cplusplus/Overview.h>
 #include <cplusplus/pp.h>
 
 #include <QDebug>

src/plugins/cpptools/cppprojectfile.h

@@ -33,8 +33,6 @@
 
 #include "cpptools_global.h"
 
-#include <utils/mimetypes/mimetype.h>
-
 #include <QHash>
 #include <QList>
 #include <QString>

src/plugins/cpptools/cppprojects.cpp

@@ -34,11 +34,14 @@
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
+#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
+#include <QDir>
 #include <QSet>
 #include <QTextStream>
 

src/plugins/cpptools/cppprojects.h

@@ -35,7 +35,6 @@
 
 #include "cppprojectfile.h"
 
-#include <projectexplorer/project.h>
 #include <projectexplorer/toolchain.h>
 
 #include <cplusplus/Token.h>
@@ -45,7 +44,12 @@
 
 #include <functional>
 
+namespace ProjectExplorer { class Project; }
+
+namespace Utils { class FileName; }
+
 namespace CppTools {
+class ProjectFile;
 
 class CPPTOOLS_EXPORT ProjectPart
 {

src/plugins/cpptools/cpprefactoringchanges.cpp

@@ -39,6 +39,8 @@
 
 #include <utils/qtcassert.h>
 
+#include <QTextDocument>
+
 using namespace CPlusPlus;
 
 namespace CppTools {

src/plugins/cpptools/cpprefactoringchanges.h

@@ -32,12 +32,11 @@
 #define CPPREFACTORINGCHANGES_H
 
 #include "cpptools_global.h"
-#include "cppmodelmanager.h"
+
+#include <cplusplus/CppDocument.h>
 
 #include <texteditor/refactoringchanges.h>
 
-#include <cplusplus/LookupContext.h>
-
 namespace CppTools {
 
 class CppRefactoringChanges;

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -56,6 +56,7 @@
 #include <coreplugin/jsexpander.h>
 #include <coreplugin/vcsmanager.h>
 #include <cppeditor/cppeditorconstants.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projecttree.h>
 
 #include <utils/fileutils.h>

src/plugins/cpptools/cpptoolstestcase.cpp

@@ -29,10 +29,11 @@
 ****************************************************************************/
 
 #include "cpptoolstestcase.h"
-
+#include "cppmodelmanager.h"
 #include "cppworkingcopy.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <texteditor/texteditor.h>

src/plugins/cpptools/cpptoolstestcase.h

@@ -31,10 +31,9 @@
 #ifndef CPPTOOLSTESTCASE_H
 #define CPPTOOLSTESTCASE_H
 
-#include "cppmodelmanager.h"
 #include "cpptools_global.h"
 
-#include <coreplugin/editormanager/ieditor.h>
+#include <cplusplus/CppDocument.h>
 
 #include <QStringList>
 #include <QTemporaryDir>
@@ -53,6 +52,9 @@ class IAssistProposal;
 }
 
 namespace CppTools {
+class CppModelManager;
+class ProjectInfo;
+
 namespace Tests {
 
 class CPPTOOLS_EXPORT TestDocument

src/plugins/cpptools/doxygengenerator.h

@@ -35,7 +35,7 @@
 
 #include <cplusplus/Overview.h>
 
-#include <QTextCursor>
+QT_FORWARD_DECLARE_CLASS(QTextCursor)
 
 namespace CPlusPlus { class DeclarationAST; }
 

src/plugins/cpptools/editordocumenthandle.h

@@ -31,10 +31,10 @@
 #ifndef EDITORDOCUMENTHANDLE_H
 #define EDITORDOCUMENTHANDLE_H
 
-#include "baseeditordocumentprocessor.h"
 #include "cpptools_global.h"
 
 namespace CppTools {
+class BaseEditorDocumentProcessor;
 
 class CPPTOOLS_EXPORT CppEditorDocumentHandle
 {

src/plugins/cpptools/insertionpointlocator.cpp

@@ -30,12 +30,15 @@
 
 #include "insertionpointlocator.h"
 
+#include "cppprojectfile.h"
 #include "cpptoolsreuse.h"
 #include "symbolfinder.h"
 #include "cpptoolsconstants.h"
 
 #include <coreplugin/icore.h>
 
+#include <cplusplus/LookupContext.h>
+
 #include <utils/qtcassert.h>
 
 using namespace CPlusPlus;

src/plugins/cpptools/modelmanagertesthelper.h

@@ -33,6 +33,8 @@
 
 #include "cppmodelmanager.h"
 
+#include <projectexplorer/project.h>
+
 #include <QObject>
 
 namespace CppTools {

src/plugins/cpptools/semantichighlighter.cpp

@@ -29,13 +29,16 @@
 ****************************************************************************/
 
 #include "semantichighlighter.h"
+#include "cppsemanticinfo.h"
 
 #include <texteditor/fontsettings.h>
 #include <texteditor/syntaxhighlighter.h>
+#include <texteditor/textdocument.h>
 
 #include <utils/qtcassert.h>
 
 #include <QLoggingCategory>
+#include <QTextDocument>
 
 using namespace CPlusPlus;
 using TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats;

src/plugins/cpptools/semantichighlighter.h

@@ -31,18 +31,19 @@
 #ifndef SEMANTICHIGHLIGHTER_H
 #define SEMANTICHIGHLIGHTER_H
 
-#include "cppsemanticinfo.h"
 #include "cpptools_global.h"
 
-#include <texteditor/textdocument.h>
-#include <texteditor/semantichighlighter.h>
-
 #include <QFutureWatcher>
 #include <QScopedPointer>
-#include <QTextEdit>
+#include <QTextCharFormat>
 
 #include <functional>
 
+namespace TextEditor {
+class HighlightingResult;
+class TextDocument;
+}
+
 namespace CppTools {
 
 class CPPTOOLS_EXPORT SemanticHighlighter : public QObject

src/plugins/cpptools/symbolfinder.h

@@ -33,13 +33,20 @@
 
 #include "cpptools_global.h"
 
-#include <cplusplus/CppDocument.h>
-
 #include <QHash>
 #include <QStringList>
 #include <QMultiMap>
 #include <QSet>
 
+namespace CPlusPlus {
+class Class;
+class Declaration;
+class Function;
+class LookupContext;
+class Snapshot;
+class Symbol;
+}
+
 namespace CppTools {
 
 class CPPTOOLS_EXPORT SymbolFinder

src/plugins/cpptools/symbolsearcher_test.cpp

@@ -36,6 +36,7 @@
 #include "searchsymbols.h"
 
 #include <coreplugin/testdatadir.h>
+#include <coreplugin/find/searchresultwindow.h>
 #include <utils/runextensions.h>
 
 #include <QtTest>

src/plugins/cpptools/symbolsfindfilter.cpp

@@ -36,6 +36,8 @@
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/find/searchresultwindow.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 

src/plugins/cpptools/symbolsfindfilter.h

@@ -41,6 +41,8 @@
 #include <QCheckBox>
 #include <QRadioButton>
 
+namespace Core { class SearchResult; }
+
 namespace CppTools {
 
 class CppModelManager;

src/plugins/cpptools/typehierarchybuilder.h

@@ -32,14 +32,15 @@
 #define CPPTOOLS_TYPEHIERARCHYBUILDER_H
 
 #include "cpptools_global.h"
-#include "cppmodelmanager.h"
 
+#include <cplusplus/CppDocument.h>
 #include <cplusplus/Overview.h>
 
 #include <QList>
-#include <QStringList>
 #include <QSet>
 
+QT_FORWARD_DECLARE_CLASS(QStringList)
+
 namespace CppTools {
 
 class CPPTOOLS_EXPORT TypeHierarchy

src/plugins/designer/qtcreatorintegration.cpp

@@ -40,6 +40,7 @@
 #include <cpptools/cppworkingcopy.h>
 #include <cpptools/insertionpointlocator.h>
 #include <cpptools/symbolfinder.h>
+#include <cplusplus/LookupContext.h>
 #include <cplusplus/Overview.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>

src/plugins/qmljstools/qmljsmodelmanager.cpp

@@ -35,6 +35,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/documentmodel.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <cpptools/cppmodelmanager.h>