fix include style relating to cplusplus libraries

... and adjust INCLUDEPATH accordingly.

while i'm at messing with include statements, also re-order the include
blocks according to policy and sort them within bigger blocks.

Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

src/plugins/cpptools/ModelManagerInterface.cpp

@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include "ModelManagerInterface.h"
-#include "pp-engine.h"
+
+#include <cplusplus/pp-engine.h>
 
 #include <QtCore/QSet>
 

src/plugins/cpptools/ModelManagerInterface.h

@@ -30,11 +30,12 @@
 #ifndef CPPMODELMANAGERINTERFACE_H
 #define CPPMODELMANAGERINTERFACE_H
 
-#include <cplusplus/CppDocument.h>
-#include <languageutils/fakemetaobject.h>
 #include "cpptools_global.h"
 #include "cppprojectfile.h"
 
+#include <cplusplus/CppDocument.h>
+#include <languageutils/fakemetaobject.h>
+
 #include <QObject>
 #include <QHash>
 #include <QPointer>

src/plugins/cpptools/TypeHierarchyBuilder.cpp

@@ -28,14 +28,15 @@
 ****************************************************************************/
 
 #include "TypeHierarchyBuilder.h"
-#include "FindUsages.h"
-#include "Symbols.h"
-#include "SymbolVisitor.h"
-#include "DependencyTable.h"
-#include "CppDocument.h"
-#include "Literals.h"
-#include "TranslationUnit.h"
-#include "CoreTypes.h"
+
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/DependencyTable.h>
+#include <cplusplus/FindUsages.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
 
 using namespace CPlusPlus;
 

src/plugins/cpptools/TypeHierarchyBuilder.h

@@ -30,10 +30,11 @@
 #ifndef TYPEHIERARCHYBUILDER_H
 #define TYPEHIERARCHYBUILDER_H
 
-#include "CppDocument.h"
-#include "ModelManagerInterface.h"
-#include "Overview.h"
 #include "cpptools_global.h"
+#include "ModelManagerInterface.h"
+
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/Overview.h>
 
 #include <QList>
 #include <QStringList>

src/plugins/cpptools/abstracteditorsupport.cpp

@@ -28,19 +28,21 @@
 ****************************************************************************/
 
 #include "abstracteditorsupport.h"
+
 #include "cpptoolsconstants.h"
 #include "cppfilesettingspage.h"
-
-#include <cplusplus/Overview.h>
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/ExpressionUnderCursor.h>
 #include "ModelManagerInterface.h"
-#include <CoreTypes.h>
-#include <Names.h>
-#include <Symbols.h>
-#include <Scope.h>
 
 #include <coreplugin/icore.h>
+
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/ExpressionUnderCursor.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+
 #include <QDebug>
 
 using namespace CPlusPlus;

src/plugins/cpptools/builtinindexingsupport.cpp

@@ -1,10 +1,12 @@
 #include "builtinindexingsupport.h"
+
 #include "cppmodelmanager.h"
 #include "searchsymbols.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+
 #include <utils/runextensions.h>
 
 #include <QCoreApplication>

src/plugins/cpptools/completionsettingspage.cpp

@@ -28,13 +28,15 @@
 ****************************************************************************/
 
 #include "completionsettingspage.h"
-#include "ui_completionsettingspage.h"
+
+#include <ui_completionsettingspage.h>
 #include "cpptoolsconstants.h"
 
 #include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <QTextStream>
 #include <QCoreApplication>
 

src/plugins/cpptools/cppchecksymbols.cpp

@@ -28,27 +28,26 @@
 ****************************************************************************/
 
 #include "cppchecksymbols.h"
+
 #include "cpplocalsymbols.h"
 
+#include <cplusplus/AST.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Scope.h>
 #include <cplusplus/SimpleLexer.h>
-
-#include <Names.h>
-#include <Literals.h>
-#include <Symbols.h>
-#include <TranslationUnit.h>
-#include <Scope.h>
-#include <AST.h>
-#include <SymbolVisitor.h>
-#include <Overview.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
 
 #include <utils/qtcassert.h>
+#include <utils/runextensions.h>
 
 #include <QCoreApplication>
 #include <QThreadPool>
 #include <QDebug>
 
-#include <utils/runextensions.h>
-
 // This is for experimeting highlighting ctors/dtors as functions (instead of types).
 // Whenever this feature is considered "accepted" the switch below should be permanently
 // removed, unless we decide to actually make this a user setting - that is why it's

src/plugins/cpptools/cppchecksymbols.h

@@ -31,16 +31,15 @@
 #define CPLUSPLUSCHECKSYMBOLS_H
 
 #include "cpptools_global.h"
-
 #include "cppsemanticinfo.h"
 
+#include <texteditor/semantichighlighter.h>
+
+#include <cplusplus/ASTVisitor.h>
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/TypeOfExpression.h>
 
-#include <texteditor/semantichighlighter.h>
-
-#include <ASTVisitor.h>
 #include <QSet>
 #include <QFuture>
 #include <QtConcurrentRun>

src/plugins/cpptools/cppcodeformatter.cpp

@@ -29,11 +29,14 @@
 
 #include "cppcodeformatter.h"
 
-#include <Token.h>
-#include <Lexer.h>
+#include "cppcodestylesettingspage.h"
 
 #include <texteditor/basetextdocumentlayout.h>
 #include <texteditor/tabsettings.h>
+
+#include <cplusplus/Token.h>
+#include <cplusplus/Lexer.h>
+
 #include <utils/qtcassert.h>
 
 #include <QDebug>
@@ -42,8 +45,6 @@
 #include <QTextCursor>
 #include <QTextBlock>
 
-#include "cppcodestylesettingspage.h"
-
 using namespace CPlusPlus;
 using namespace CppTools;
 using namespace TextEditor;

src/plugins/cpptools/cppcodeformatter.h

@@ -31,11 +31,12 @@
 #define CPPCODEFORMATTER_H
 
 #include "cpptools_global.h"
+#include "cppcodestylesettings.h"
 
-#include <Token.h>
-#include <cplusplus/SimpleLexer.h>
 #include <texteditor/tabsettings.h>
-#include <cpptools/cppcodestylesettings.h>
+
+#include <cplusplus/Token.h>
+#include <cplusplus/SimpleLexer.h>
 
 #include <QChar>
 #include <QStack>

src/plugins/cpptools/cppcodegen_test.cpp

@@ -27,20 +27,20 @@
 **
 ****************************************************************************/
 
+#include "insertionpointlocator.h"
+#include "cpprefactoringchanges.h"
 #include "cpptoolsplugin.h"
 
-#include <AST.h>
-#include <Control.h>
-#include <CppDocument.h>
-#include <DiagnosticClient.h>
-#include <Scope.h>
-#include <TranslationUnit.h>
-#include <Literals.h>
-#include <Bind.h>
-#include <Symbols.h>
-#include <cpptools/insertionpointlocator.h>
-#include <cpptools/cpprefactoringchanges.h>
-#include <cpptools/cpptoolsplugin.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/Bind.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/DiagnosticClient.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <extensionsystem/pluginmanager.h>
 #include <utils/fileutils.h>
 

src/plugins/cpptools/cppcodestylepreferences.h

@@ -32,6 +32,7 @@
 
 #include "cpptools_global.h"
 #include "cppcodestylesettings.h"
+
 #include <texteditor/icodestylepreferences.h>
 
 namespace CppTools {

src/plugins/cpptools/cppcodestylepreferencesfactory.cpp

@@ -28,15 +28,19 @@
 ****************************************************************************/
 
 #include "cppcodestylepreferencesfactory.h"
+
 #include "cppcodestylesettings.h"
 #include "cppcodestylesettingspage.h"
 #include "cppcodestylepreferences.h"
 #include "cpptoolsconstants.h"
 #include "cppqtstyleindenter.h"
-#include <extensionsystem/pluginmanager.h>
-#include <texteditor/tabsettings.h>
-#include <texteditor/snippets/isnippetprovider.h>
+
 #include <cppeditor/cppeditorconstants.h>
+#include <texteditor/snippets/isnippetprovider.h>
+#include <texteditor/tabsettings.h>
+
+#include <extensionsystem/pluginmanager.h>
+
 #include <QLayout>
 
 using namespace CppTools;

src/plugins/cpptools/cppcodestylesettings.cpp

@@ -28,18 +28,17 @@
 ****************************************************************************/
 
 #include "cppcodestylesettings.h"
-#include "cppcodestylepreferencesfactory.h"
 
-#include <cpptools/cppcodestylepreferences.h>
-#include <cpptools/cpptoolsconstants.h>
-#include <cpptools/cpptoolssettings.h>
+#include "cppcodestylepreferencesfactory.h"
+#include "cppcodestylepreferences.h"
+#include "cpptoolsconstants.h"
+#include "cpptoolssettings.h"
 
 #include <projectexplorer/editorconfiguration.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 
 #include <utils/qtcassert.h>
-
 #include <utils/settingsutils.h>
 
 static const char groupPostfix[] = "IndentSettings";

src/plugins/cpptools/cppcodestylesettingspage.cpp

@@ -28,19 +28,16 @@
 ****************************************************************************/
 
 #include "cppcodestylesettingspage.h"
+
 #include "cppcodestylepreferences.h"
 #include "cpppointerdeclarationformatter.h"
 #include "cppqtstyleindenter.h"
 #include "cpptoolsconstants.h"
 #include "cpptoolssettings.h"
-#include "ui_cppcodestylesettingspage.h"
-
-#include <Overview.h>
-#include <pp.h>
+#include <ui_cppcodestylesettingspage.h>
 
 #include <coreplugin/icore.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <extensionsystem/pluginmanager.h>
 #include <texteditor/codestyleeditor.h>
 #include <texteditor/displaysettings.h>
 #include <texteditor/fontsettings.h>
@@ -48,6 +45,11 @@
 #include <texteditor/tabsettings.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <cplusplus/Overview.h>
+#include <cplusplus/pp.h>
+
+#include <extensionsystem/pluginmanager.h>
+
 #include <QTextBlock>
 #include <QTextStream>
 

src/plugins/cpptools/cppcodestylesettingspage.h

@@ -31,17 +31,17 @@
 #define CPPCODESTYLESETTINGSPAGE_H
 
 #include "cpptools_global.h"
+#include "cppcodestylesettings.h"
+#include "cppcodeformatter.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
+
 #include <QWidget>
 #include <QPointer>
 #include <QSharedPointer>
 #include <QVariant>
 #include <QStringList>
 
-#include "cppcodestylesettings.h"
-#include "cppcodeformatter.h"
-
 namespace TextEditor {
     class FontSettings;
     class TabSettings;

src/plugins/cpptools/cppcompletion_test.cpp

@@ -28,25 +28,26 @@
 ****************************************************************************/
 
 #include "cpptoolsplugin.h"
+#include "cppcompletionassist.h"
 
-#include <AST.h>
-#include <Control.h>
-#include <CppDocument.h>
-#include <DiagnosticClient.h>
-#include <Scope.h>
-#include <TranslationUnit.h>
-#include <Literals.h>
-#include <Bind.h>
-#include <Symbols.h>
-#include <utils/changeset.h>
 #include <texteditor/basetextdocument.h>
 #include <texteditor/plaintexteditor.h>
 #include <texteditor/codeassist/iassistproposal.h>
 #include <texteditor/codeassist/iassistproposalmodel.h>
 #include <texteditor/codeassist/basicproposalitemlistmodel.h>
-#include <cpptools/cpptoolsplugin.h>
-#include <cpptools/cppcompletionassist.h>
+
+#include <cplusplus/AST.h>
+#include <cplusplus/Bind.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/DiagnosticClient.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <extensionsystem/pluginmanager.h>
+#include <utils/changeset.h>
 #include <utils/fileutils.h>
 
 #include <QtTest>

src/plugins/cpptools/cppcompletionassist.cpp

@@ -28,30 +28,11 @@
 ****************************************************************************/
 
 #include "cppcompletionassist.h"
+
 #include "cppmodelmanager.h"
 #include "cppdoxygen.h"
 #include "cpptoolsconstants.h"
 
-#include <Control.h>
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <CoreTypes.h>
-#include <Literals.h>
-#include <Names.h>
-#include <NameVisitor.h>
-#include <Symbols.h>
-#include <SymbolVisitor.h>
-#include <Scope.h>
-#include <TranslationUnit.h>
-#include <CppRewriter.h>
-
-#include <cplusplus/ResolveExpression.h>
-#include <cplusplus/MatchingText.h>
-#include <cplusplus/Overview.h>
-#include <cplusplus/ExpressionUnderCursor.h>
-#include <cplusplus/BackwardsScanner.h>
-#include <cplusplus/LookupContext.h>
-
 #include <coreplugin/idocument.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
@@ -64,8 +45,28 @@
 #include <texteditor/snippets/snippet.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/completionsettings.h>
+
 #include <utils/qtcassert.h>
 
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/BackwardsScanner.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/ExpressionUnderCursor.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/LookupContext.h>
+#include <cplusplus/MatchingText.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/ResolveExpression.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <QLatin1String>
 #include <QTextCursor>
 #include <QTextDocument>

src/plugins/cpptools/cppcompletionassist.h

@@ -32,21 +32,21 @@
 
 #include "cppcompletionassistprovider.h"
 
+#include <cplusplus/CppDocument.h>
 #include <cplusplus/Icons.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
-#include <cplusplus/CppDocument.h>
 #if QT_VERSION >= 0x050000
 // Qt 5 requires the types to be defined for Q_DECLARE_METATYPE
 #  include <cplusplus/Symbol.h>
 #endif
 
+#include <texteditor/codeassist/basicproposalitem.h>
 #include <texteditor/codeassist/basicproposalitemlistmodel.h>
 #include <texteditor/codeassist/completionassistprovider.h>
+#include <texteditor/codeassist/defaultassistinterface.h>
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/snippets/snippetassistcollector.h>
-#include <texteditor/codeassist/defaultassistinterface.h>
-#include <texteditor/codeassist/basicproposalitem.h>
 
 #include <QStringList>
 #include <QVariant>

src/plugins/cpptools/cppcompletionassistprovider.cpp

@@ -31,7 +31,7 @@
 
 #include <cppeditor/cppeditorconstants.h>
 
-#include <Token.h>
+#include <cplusplus/Token.h>
 
 using namespace CPlusPlus;
 using namespace CppTools;

src/plugins/cpptools/cppcurrentdocumentfilter.cpp

@@ -26,10 +26,13 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+
 #include "cppcurrentdocumentfilter.h"
+
 #include "cppmodelmanager.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+
 #include <cplusplus/CppDocument.h>
 
 #include <QStringMatcher>

src/plugins/cpptools/cppcurrentdocumentfilter.h

@@ -30,6 +30,7 @@
 #define CPPCURRENTDOCUMENTFILTER_H
 
 #include "searchsymbols.h"
+
 #include <locator/ilocatorfilter.h>
 
 namespace Core {

src/plugins/cpptools/cppfilesettingspage.cpp

@@ -28,8 +28,9 @@
 ****************************************************************************/
 
 #include "cppfilesettingspage.h"
+
 #include "cpptoolsconstants.h"
-#include "ui_cppfilesettingspage.h"
+#include <ui_cppfilesettingspage.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -37,7 +38,6 @@
 #include <cppeditor/cppeditorconstants.h>
 
 #include <extensionsystem/pluginmanager.h>
-
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 
@@ -50,7 +50,6 @@
 #include <QLocale>
 #include <QTextCodec>
 #include <QTextStream>
-
 #include <QFileDialog>
 #include <QMessageBox>
 

src/plugins/cpptools/cppfindreferences.cpp

@@ -28,34 +28,37 @@
 ****************************************************************************/
 
 #include "cppfindreferences.h"
-#include "cpptoolsconstants.h"
 
-#include <texteditor/basetexteditor.h>
-#include <texteditor/basefilefind.h>
+#include "cpptoolsconstants.h"
+#include "ModelManagerInterface.h"
+
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/infobar.h>
+#include <coreplugin/progressmanager/futureprogress.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <find/searchresultwindow.h>
+#include <texteditor/basefilefind.h>
+#include <texteditor/basetexteditor.h>
+
 #include <extensionsystem/pluginmanager.h>
 #include <utils/filesearch.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
-#include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/progressmanager/futureprogress.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/infobar.h>
+#include <utils/runextensions.h>
+#include <utils/textfileformat.h>
 
-#include <ASTVisitor.h>
-#include <AST.h>
-#include <Control.h>
-#include <Literals.h>
-#include <TranslationUnit.h>
-#include <Symbols.h>
-#include <Names.h>
-#include <Scope.h>
-
-#include <cpptools/ModelManagerInterface.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Control.h>
 #include <cplusplus/CppDocument.h>
-#include <cplusplus/Overview.h>
 #include <cplusplus/FindUsages.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
 
 #include <QTime>
 #include <QTimer>
@@ -63,8 +66,6 @@
 #include <QtConcurrentMap>
 #include <QDir>
 #include <QApplication>
-#include <utils/runextensions.h>
-#include <utils/textfileformat.h>
 
 #include <functional>
 

src/plugins/cpptools/cppfindreferences.h

@@ -31,6 +31,7 @@
 #define CPPFINDREFERENCES_H
 
 #include <utils/filesearch.h>
+
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/DependencyTable.h>
 #include <cplusplus/FindUsages.h>

src/plugins/cpptools/cpphighlightingsupport.h

@@ -32,9 +32,10 @@
 
 #include "cpptools_global.h"
 
-#include <cplusplus/CppDocument.h>
 #include <texteditor/semantichighlighter.h>
 
+#include <cplusplus/CppDocument.h>
+
 #include <QFuture>
 
 namespace TextEditor {

src/plugins/cpptools/cpphighlightingsupportinternal.cpp

@@ -28,13 +28,15 @@
 ****************************************************************************/
 
 #include "cpphighlightingsupportinternal.h"
+
 #include "cppchecksymbols.h"
+#include "cpptoolsreuse.h"
+
+#include <texteditor/itexteditor.h>
 
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/SimpleLexer.h>
 #include <cplusplus/Token.h>
-#include <cpptools/cpptoolsreuse.h>
-#include <texteditor/itexteditor.h>
 
 using namespace CPlusPlus;
 using namespace CppTools;

src/plugins/cpptools/cpphighlightingsupportinternal.h

@@ -32,9 +32,10 @@
 
 #include "cpphighlightingsupport.h"
 
-#include <cplusplus/CppDocument.h>
 #include <texteditor/semantichighlighter.h>
 
+#include <cplusplus/CppDocument.h>
+
 #include <QFuture>
 
 namespace CppTools {

src/plugins/cpptools/cpplocalsymbols.cpp

@@ -28,16 +28,17 @@
 ****************************************************************************/
 
 #include "cpplocalsymbols.h"
+
 #include "cppsemanticinfo.h"
 
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/CoreTypes.h>
 #include <cplusplus/CppDocument.h>
-#include <ASTVisitor.h>
-#include <AST.h>
-#include <Scope.h>
-#include <Symbols.h>
-#include <CoreTypes.h>
-#include <Names.h>
-#include <Literals.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
 
 using namespace CPlusPlus;
 using namespace CppTools;

src/plugins/cpptools/cpplocalsymbols.h

@@ -34,7 +34,7 @@
 #include "cppsemanticinfo.h"
 
 #include <cplusplus/CppDocument.h>
-#include <ASTfwd.h>
+#include <cplusplus/ASTfwd.h>
 
 namespace CppTools {
 

src/plugins/cpptools/cpplocatorfilter.cpp

@@ -32,6 +32,7 @@
 
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
+
 #include <utils/fileutils.h>
 
 #include <QStringMatcher>

src/plugins/cpptools/cpplocatorfilter.h

@@ -31,6 +31,7 @@
 #define CPPLOCATORFILTER_H
 
 #include "searchsymbols.h"
+
 #include <locator/ilocatorfilter.h>
 
 namespace CppTools {

src/plugins/cpptools/cppmodelmanager.cpp

@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "cppmodelmanager.h"
+
 #include "builtinindexingsupport.h"
 #include "cppcompletionassist.h"
 #include "cpphighlightingsupport.h"
@@ -38,42 +39,38 @@
 #include "cpptoolseditorsupport.h"
 #include "cppfindreferences.h"
 
-#include <cplusplus/pp.h>
-#include <cplusplus/Overview.h>
-
-#include <functional>
-#include <QtConcurrentRun>
-#include <QFutureSynchronizer>
-#include <utils/runextensions.h>
-#include <texteditor/itexteditor.h>
-#include <texteditor/basetexteditor.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/session.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/progressmanager/progressmanager.h>
-#include <extensionsystem/pluginmanager.h>
+#include <texteditor/basetexteditor.h>
+#include <texteditor/itexteditor.h>
 
+#include <extensionsystem/pluginmanager.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/runextensions.h>
 
-#include <TranslationUnit.h>
-#include <AST.h>
-#include <Scope.h>
-#include <Literals.h>
-#include <Symbols.h>
-#include <Names.h>
-#include <NameVisitor.h>
-#include <TypeVisitor.h>
-#include <ASTVisitor.h>
-#include <Lexer.h>
-#include <Token.h>
-#include <Parser.h>
-#include <Control.h>
-#include <CoreTypes.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Lexer.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Parser.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Token.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/TypeVisitor.h>
+#include <cplusplus/pp.h>
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -81,9 +78,11 @@
 #include <QTime>
 #include <QTimer>
 #include <QtConcurrentMap>
-
 #include <QTextBlock>
+#include <QtConcurrentRun>
+#include <QFutureSynchronizer>
 
+#include <functional>
 #include <iostream>
 #include <sstream>
 

src/plugins/cpptools/cppmodelmanager.h

@@ -33,10 +33,12 @@
 #include "cpptools_global.h"
 #include "cpptoolsconstants.h"
 #include "ModelManagerInterface.h"
+
 #include <projectexplorer/project.h>
+#include <texteditor/basetexteditor.h>
+
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/PreprocessorClient.h>
-#include <texteditor/basetexteditor.h>
 #include <cplusplus/PreprocessorEnvironment.h>
 #include <cplusplus/pp-engine.h>
 

src/plugins/cpptools/cppmodelmanager_test.cpp

@@ -28,10 +28,12 @@
 ****************************************************************************/
 
 #include "cpptoolsplugin.h"
-#include "CppDocument.h"
+
 #include "cppmodelmanager.h"
 #include "modelmanagertesthelper.h"
 
+#include <cplusplus/CppDocument.h>
+
 #include <QtTest>
 #include <QDebug>
 

src/plugins/cpptools/cpppointerdeclarationformatter.cpp

@@ -30,7 +30,7 @@
 
 #include "cpppointerdeclarationformatter.h"
 
-#include <AST.h>
+#include <cplusplus/AST.h>
 
 #include <QtGlobal>
 #include <QTextCursor>

src/plugins/cpptools/cpppointerdeclarationformatter.h

@@ -31,13 +31,13 @@
 #define CPPPOINTERDECLARATIONFORMATTER_H
 
 #include "cpptools_global.h"
+#include "cpprefactoringchanges.h"
 
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <Overview.h>
-#include <Symbols.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Symbols.h>
 
-#include <cpptools/cpprefactoringchanges.h>
 #include <utils/changeset.h>
 
 namespace CppTools {

src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp

@@ -27,21 +27,22 @@
 **
 ****************************************************************************/
 
+#include "cpptoolsplugin.h"
+#include "cpppointerdeclarationformatter.h"
+#include "cpprefactoringchanges.h"
 #include "cpptoolsplugin.h"
 
-#include <AST.h>
-#include <CppDocument.h>
-#include <Symbols.h>
-#include <TranslationUnit.h>
-#include <pp.h>
-
-#include <cpptools/cpppointerdeclarationformatter.h>
-#include <cpptools/cpprefactoringchanges.h>
-#include <cpptools/cpptoolsplugin.h>
 #include <texteditor/plaintexteditor.h>
+
 #include <utils/changeset.h>
 #include <utils/fileutils.h>
 
+#include <cplusplus/AST.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/pp.h>
+
 #include <QDebug>
 #include <QDir>
 #include <QTextCursor>

src/plugins/cpptools/cppprojectfile.cpp

@@ -28,8 +28,11 @@
 ****************************************************************************/
 
 #include "cppprojectfile.h"
-#include <coreplugin/icore.h>
+
 #include "cpptoolsconstants.h"
+
+#include <coreplugin/icore.h>
+
 #include <QDebug>
 
 namespace CPlusPlus {

src/plugins/cpptools/cppprojectfile.h

@@ -30,10 +30,12 @@
 #ifndef CPLUSPLUS_CPPPROJECTFILE_H
 #define CPLUSPLUS_CPPPROJECTFILE_H
 
+#include "cpptools_global.h"
+
+#include <coreplugin/mimedatabase.h>
+
 #include <QString>
 #include <QMap>
-#include <coreplugin/mimedatabase.h>
-#include "cpptools_global.h"
 
 namespace CPlusPlus {
 

src/plugins/cpptools/cppqtstyleindenter.cpp

@@ -33,6 +33,7 @@
 #include "cpptoolssettings.h"
 #include "cppcodestylepreferences.h"
 #include "cpptoolsconstants.h"
+
 #include <texteditor/tabsettings.h>
 #include <texteditor/texteditorsettings.h>
 

src/plugins/cpptools/cpprefactoringchanges.cpp

@@ -28,18 +28,21 @@
 ****************************************************************************/
 
 #include "cpprefactoringchanges.h"
+
 #include "cppcodestylepreferences.h"
 #include "cppqtstyleindenter.h"
+#include "cppcodeformatter.h"
+#include "cppmodelmanager.h"
+#include "cpptoolssettings.h"
+#include "cpptoolsconstants.h"
 
-#include <TranslationUnit.h>
-#include <AST.h>
-#include <cpptools/cppcodeformatter.h>
-#include <cpptools/cppmodelmanager.h>
-#include <cpptools/cpptoolssettings.h>
-#include <cpptools/cpptoolsconstants.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/tabsettings.h>
 #include <projectexplorer/editorconfiguration.h>
+
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/AST.h>
+
 #include <utils/qtcassert.h>
 
 #include <QTextBlock>

src/plugins/cpptools/cpprefactoringchanges.h

@@ -30,15 +30,15 @@
 #ifndef CPPREFACTORINGCHANGES_H
 #define CPPREFACTORINGCHANGES_H
 
-#include <ASTfwd.h>
+#include "cpptools_global.h"
 #include "ModelManagerInterface.h"
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/LookupContext.h>
-
-#include <cpptools/cpptools_global.h>
 
 #include <texteditor/refactoringchanges.h>
 
+#include <cplusplus/ASTfwd.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/LookupContext.h>
+
 namespace CppTools {
 
 class CppRefactoringChanges;

src/plugins/cpptools/cppsemanticinfo.h

@@ -32,9 +32,11 @@
 
 #include "cpptools_global.h"
 
+#include <texteditor/semantichighlighter.h>
+
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/LookupContext.h>
-#include <texteditor/semantichighlighter.h>
+
 #include <QHash>
 
 namespace CppTools {

src/plugins/cpptools/cpptools.pro

@@ -1,7 +1,6 @@
 TARGET = CppTools
 include(../../qtcreatorplugin.pri)
 
-INCLUDEPATH += .
 DEFINES += CPPTOOLS_LIBRARY
 HEADERS += completionsettingspage.h \
     cppclassesfilter.h \

src/plugins/cpptools/cpptoolseditorsupport.cpp

@@ -28,18 +28,18 @@
 ****************************************************************************/
 
 #include "cpptoolseditorsupport.h"
+
 #include "cppcompletionsupport.h"
 #include "cpphighlightingsupport.h"
 #include "cppmodelmanager.h"
 
 #include <coreplugin/idocument.h>
-
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <TranslationUnit.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/TranslationUnit.h>
 
 #include <QTimer>
 

src/plugins/cpptools/cpptoolseditorsupport.h

@@ -30,16 +30,15 @@
 #ifndef CPPTOOLSEDITORSUPPORT_H
 #define CPPTOOLSEDITORSUPPORT_H
 
+#include <cplusplus/CppDocument.h>
+
 #include <QObject>
 #include <QPointer>
 #include <QFuture>
 #include <QScopedPointer>
 #include <QSharedPointer>
-
 #include <QTextCursor>
 
-#include <cplusplus/CppDocument.h>
-
 QT_BEGIN_NAMESPACE
 class QTimer;
 QT_END_NAMESPACE

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "cpptoolsplugin.h"
+
 #include "completionsettingspage.h"
 #include "cppfilesettingspage.h"
 #include "cppcodestylesettingspage.h"
@@ -41,30 +42,26 @@
 #include "cpptoolssettings.h"
 #include "cpptoolsreuse.h"
 
-#include <extensionsystem/pluginmanager.h>
-
-#include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/id.h>
+#include <coreplugin/mimedatabase.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/vcsmanager.h>
-#include <coreplugin/documentmanager.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <texteditor/basetexteditor.h>
-
-#include <QtConcurrentRun>
-#include <QFutureSynchronizer>
-#include <utils/runextensions.h>
-
 #include <find/ifindfilter.h>
 #include <find/searchresultwindow.h>
+#include <texteditor/basetexteditor.h>
+
+#include <extensionsystem/pluginmanager.h>
 #include <utils/filesearch.h>
 #include <utils/qtcassert.h>
+#include <utils/runextensions.h>
 
 #include <QtPlugin>
 #include <QFileInfo>
@@ -73,6 +70,8 @@
 #include <QSettings>
 #include <QMenu>
 #include <QAction>
+#include <QtConcurrentRun>
+#include <QFutureSynchronizer>
 
 #include <sstream>
 

src/plugins/cpptools/cpptoolsplugin.h

@@ -32,9 +32,10 @@
 
 #include "cpptools_global.h"
 
-#include <extensionsystem/iplugin.h>
-#include <projectexplorer/projectexplorer.h>
 #include <find/ifindfilter.h>
+#include <projectexplorer/projectexplorer.h>
+
+#include <extensionsystem/iplugin.h>
 #include <utils/filesearch.h>
 
 #include <QTextDocument>

src/plugins/cpptools/cpptoolsreuse.cpp

@@ -29,8 +29,8 @@
 
 #include "cpptoolsreuse.h"
 
-#include <Symbols.h>
-#include <CoreTypes.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/CoreTypes.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/LookupContext.h>
 

src/plugins/cpptools/cpptoolssettings.cpp

@@ -28,20 +28,22 @@
 ****************************************************************************/
 
 #include "cpptoolssettings.h"
+
 #include "cpptoolsconstants.h"
 #include "cppcodestylepreferences.h"
 #include "cppcodestylepreferencesfactory.h"
 #include "commentssettings.h"
 #include "completionsettingspage.h"
 
-#include <texteditor/texteditorsettings.h>
-#include <texteditor/tabsettings.h>
-#include <texteditor/codestylepool.h>
-#include <extensionsystem/pluginmanager.h>
-
-#include <utils/settingsutils.h>
-#include <utils/qtcassert.h>
 #include <coreplugin/icore.h>
+#include <texteditor/codestylepool.h>
+#include <texteditor/tabsettings.h>
+#include <texteditor/texteditorsettings.h>
+
+#include <extensionsystem/pluginmanager.h>
+#include <utils/qtcassert.h>
+#include <utils/settingsutils.h>
+
 #include <QSettings>
 
 static const char idKey[] = "CppGlobal";

src/plugins/cpptools/doxygengenerator.cpp

@@ -29,15 +29,15 @@
 
 #include "doxygengenerator.h"
 
-#include <cplusplus/SimpleLexer.h>
+#include <cplusplus/AST.h>
 #include <cplusplus/BackwardsScanner.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/LookupContext.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/SimpleLexer.h>
+#include <cplusplus/Symbols.h>
 #include <cplusplus/Token.h>
 #include <cplusplus/TranslationUnit.h>
-#include <cplusplus/AST.h>
-#include <cplusplus/Symbols.h>
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/Scope.h>
-#include <cplusplus/LookupContext.h>
 
 #include <utils/qtcassert.h>
 

src/plugins/cpptools/insertionpointlocator.cpp

@@ -28,19 +28,20 @@
 ****************************************************************************/
 
 #include "insertionpointlocator.h"
+
 #include "cpptoolsreuse.h"
 #include "cpprefactoringchanges.h"
 #include "symbolfinder.h"
 
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <TranslationUnit.h>
-#include <Literals.h>
-#include <Symbols.h>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <utils/qtcassert.h>
 
 using namespace CPlusPlus;

src/plugins/cpptools/insertionpointlocator.h

@@ -31,12 +31,11 @@
 #define INSERTIONPOINTLOCATOR_H
 
 #include "cpptools_global.h"
+#include "cpprefactoringchanges.h"
 
-#include <ASTfwd.h>
-#include <CPlusPlusForwardDeclarations.h>
-
+#include <cplusplus/ASTfwd.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 #include <cplusplus/CppDocument.h>
-#include <cpptools/cpprefactoringchanges.h>
 
 namespace CppTools {
 

src/plugins/cpptools/searchsymbols.cpp

@@ -29,10 +29,11 @@
 
 #include "searchsymbols.h"
 
-#include <Literals.h>
-#include <Scope.h>
-#include <Names.h>
+#include <cplusplus/Literals.h>
 #include <cplusplus/LookupContext.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Scope.h>
+
 #include <QDebug>
 
 using namespace CPlusPlus;

src/plugins/cpptools/searchsymbols.h

@@ -31,14 +31,13 @@
 #define SEARCHSYMBOLS_H
 
 #include "cpptools_global.h"
-
 #include "cppindexingsupport.h"
 
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/Icons.h>
 #include <cplusplus/Overview.h>
-#include <Symbols.h>
-#include <SymbolVisitor.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
 
 #include <QIcon>
 #include <QMetaType>

src/plugins/cpptools/symbolfinder.cpp

@@ -33,17 +33,17 @@
 
 #include "symbolfinder.h"
 
-#include <Symbols.h>
-#include <Names.h>
-#include <Literals.h>
-#include <SymbolVisitor.h>
-#include <Control.h>
-#include <LookupContext.h>
-
-#include <QDebug>
+#include <cplusplus/Control.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/LookupContext.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
 
 #include <utils/qtcassert.h>
 
+#include <QDebug>
+
 #include <algorithm>
 #include <utility>
 

src/plugins/cpptools/symbolfinder.h

@@ -32,8 +32,8 @@
 
 #include "cpptools_global.h"
 
-#include <CppDocument.h>
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 #include <QHash>
 #include <QStringList>

src/plugins/cpptools/symbolsfindfilter.cpp

@@ -32,14 +32,15 @@
 #include "cppmodelmanager.h"
 #include "cpptoolsconstants.h"
 
-#include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/progressmanager/futureprogress.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <find/textfindconstants.h>
-#include <utils/runextensions.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
-#include <projectexplorer/project.h>
+
+#include <utils/runextensions.h>
 #include <utils/qtcassert.h>
 
 #include <QSet>

src/plugins/cpptools/uicodecompletionsupport.h

@@ -33,7 +33,6 @@
 
 #include "cpptools_global.h"
 #include "abstracteditorsupport.h"
-
 #include "ModelManagerInterface.h"
 
 #include <QDateTime>