Commit 79230320 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

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: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 4fc706d7
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
****************************************************************************/ ****************************************************************************/
#include "ASTParent.h" #include "ASTParent.h"
#include "AST.h"
#include <cplusplus/AST.h>
using namespace CPlusPlus; using namespace CPlusPlus;
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#ifndef CPLUSPLUS_ASTPARENT_H #ifndef CPLUSPLUS_ASTPARENT_H
#define CPLUSPLUS_ASTPARENT_H #define CPLUSPLUS_ASTPARENT_H
#include <ASTVisitor.h> #include <cplusplus/ASTVisitor.h>
#include <QHash> #include <QHash>
#include <QStack> #include <QStack>
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "ASTPath.h" #include "ASTPath.h"
#include <AST.h> #include <cplusplus/AST.h>
#include <TranslationUnit.h> #include <cplusplus/TranslationUnit.h>
#ifdef DEBUG_AST_PATH #ifdef DEBUG_AST_PATH
# include <QDebug> # include <QDebug>
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#ifndef CPLUSPLUS_ASTPATH_H #ifndef CPLUSPLUS_ASTPATH_H
#define CPLUSPLUS_ASTPATH_H #define CPLUSPLUS_ASTPATH_H
#include <ASTfwd.h> #include <cplusplus/ASTfwd.h>
#include <ASTVisitor.h> #include <cplusplus/ASTVisitor.h>
#include "CppDocument.h" #include "CppDocument.h"
......
...@@ -26,8 +26,11 @@ ...@@ -26,8 +26,11 @@
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** **
****************************************************************************/ ****************************************************************************/
#include "BackwardsScanner.h" #include "BackwardsScanner.h"
#include <Token.h>
#include <cplusplus/Token.h>
#include <QTextCursor> #include <QTextCursor>
#include <QTextDocument> #include <QTextDocument>
......
...@@ -31,22 +31,22 @@ ...@@ -31,22 +31,22 @@
#include "FastPreprocessor.h" #include "FastPreprocessor.h"
#include "LookupContext.h" #include "LookupContext.h"
#include "Overview.h" #include "Overview.h"
#include "Bind.h"
#include <cplusplus/Bind.h>
#include <Control.h> #include <cplusplus/Control.h>
#include <TranslationUnit.h> #include <cplusplus/TranslationUnit.h>
#include <DiagnosticClient.h> #include <cplusplus/DiagnosticClient.h>
#include <Literals.h> #include <cplusplus/Literals.h>
#include <Symbols.h> #include <cplusplus/Symbols.h>
#include <Names.h> #include <cplusplus/Names.h>
#include <AST.h> #include <cplusplus/AST.h>
#include <ASTPatternBuilder.h> #include <cplusplus/ASTPatternBuilder.h>
#include <ASTMatcher.h> #include <cplusplus/ASTMatcher.h>
#include <Scope.h> #include <cplusplus/Scope.h>
#include <SymbolVisitor.h> #include <cplusplus/SymbolVisitor.h>
#include <NameVisitor.h> #include <cplusplus/NameVisitor.h>
#include <TypeVisitor.h> #include <cplusplus/TypeVisitor.h>
#include <CoreTypes.h> #include <cplusplus/CoreTypes.h>
#include <QByteArray> #include <QByteArray>
#include <QBitArray> #include <QBitArray>
......
...@@ -30,9 +30,10 @@ ...@@ -30,9 +30,10 @@
#ifndef CPLUSPLUS_CPPDOCUMENT_H #ifndef CPLUSPLUS_CPPDOCUMENT_H
#define CPLUSPLUS_CPPDOCUMENT_H #define CPLUSPLUS_CPPDOCUMENT_H
#include <CPlusPlusForwardDeclarations.h>
#include "Macro.h" #include "Macro.h"
#include <cplusplus/CPlusPlusForwardDeclarations.h>
#include <QSharedPointer> #include <QSharedPointer>
#include <QDateTime> #include <QDateTime>
#include <QHash> #include <QHash>
......
...@@ -26,15 +26,18 @@ ...@@ -26,15 +26,18 @@
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** **
****************************************************************************/ ****************************************************************************/
#include "CppRewriter.h" #include "CppRewriter.h"
#include <TypeVisitor.h>
#include <NameVisitor.h> #include "Overview.h"
#include <CoreTypes.h>
#include <Symbols.h> #include <cplusplus/TypeVisitor.h>
#include <Literals.h> #include <cplusplus/NameVisitor.h>
#include <Names.h> #include <cplusplus/CoreTypes.h>
#include <Scope.h> #include <cplusplus/Symbols.h>
#include <Overview.h> #include <cplusplus/Literals.h>
#include <cplusplus/Names.h>
#include <cplusplus/Scope.h>
#include <QVarLengthArray> #include <QVarLengthArray>
#include <QRegExp> #include <QRegExp>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#ifndef CPLUSPLUS_DEPENDENCYTABLE_H #ifndef CPLUSPLUS_DEPENDENCYTABLE_H
#define CPLUSPLUS_DEPENDENCYTABLE_H #define CPLUSPLUS_DEPENDENCYTABLE_H
#include <CPlusPlusForwardDeclarations.h> #include <cplusplus/CPlusPlusForwardDeclarations.h>
#include <QBitArray> #include <QBitArray>
#include <QHash> #include <QHash>
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
#include "DeprecatedGenTemplateInstance.h" #include "DeprecatedGenTemplateInstance.h"
#include "Overview.h" #include "Overview.h"
#include <Control.h> #include <cplusplus/Control.h>
#include <Scope.h> #include <cplusplus/Scope.h>
#include <Names.h> #include <cplusplus/Names.h>
#include <Symbols.h> #include <cplusplus/Symbols.h>
#include <CoreTypes.h> #include <cplusplus/CoreTypes.h>
#include <Literals.h> #include <cplusplus/Literals.h>
#include <QVarLengthArray> #include <QVarLengthArray>
#include <QDebug> #include <QDebug>
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#ifndef CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H #ifndef CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H
#define CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H #define CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H
#include <TypeVisitor.h> #include <cplusplus/TypeVisitor.h>
#include <NameVisitor.h> #include <cplusplus/NameVisitor.h>
#include <FullySpecifiedType.h> #include <cplusplus/FullySpecifiedType.h>
#include <QList> #include <QList>
#include <QPair> #include <QPair>
......
...@@ -29,10 +29,12 @@ ...@@ -29,10 +29,12 @@
#include "Dumpers.h" #include "Dumpers.h"
#include <Overview.h> #include "Overview.h"
#include <Literals.h> #include "LookupContext.h"
#include <Scope.h>
#include <LookupContext.h> #include <cplusplus/Literals.h>
#include <cplusplus/Scope.h>
#include <QDebug> #include <QDebug>
#include <typeinfo> #include <typeinfo>
......
...@@ -30,10 +30,11 @@ ...@@ -30,10 +30,11 @@
#ifndef CPLUSPLUS_DUMPERS_H #ifndef CPLUSPLUS_DUMPERS_H
#define CPLUSPLUS_DUMPERS_H #define CPLUSPLUS_DUMPERS_H
#include <CPlusPlusForwardDeclarations.h> #include "LookupItem.h"
#include <FullySpecifiedType.h>
#include <Symbol.h> #include <cplusplus/CPlusPlusForwardDeclarations.h>
#include <LookupItem.h> #include <cplusplus/FullySpecifiedType.h>
#include <cplusplus/Symbol.h>
#include <QString> #include <QString>
......
...@@ -28,9 +28,11 @@ ...@@ -28,9 +28,11 @@
****************************************************************************/ ****************************************************************************/
#include "ExpressionUnderCursor.h" #include "ExpressionUnderCursor.h"
#include "SimpleLexer.h" #include "SimpleLexer.h"
#include "BackwardsScanner.h" #include "BackwardsScanner.h"
#include <Token.h>
#include <cplusplus/Token.h>
#include <QTextCursor> #include <QTextCursor>
#include <QTextBlock> #include <QTextBlock>
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#ifndef CPLUSPLUS_EXPRESSIONUNDERCURSOR_H #ifndef CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
#define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H #define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
#include "CPlusPlusForwardDeclarations.h" #include <cplusplus/CPlusPlusForwardDeclarations.h>
#include <QList> #include <QList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
......
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
****************************************************************************/ ****************************************************************************/
#include "FastPreprocessor.h" #include "FastPreprocessor.h"
#include <Literals.h>
#include <TranslationUnit.h> #include <cplusplus/Literals.h>
#include <cplusplus/TranslationUnit.h>
#include <QDir> #include <QDir>
using namespace CPlusPlus; using namespace CPlusPlus;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "CppDocument.h" #include "CppDocument.h"
#include "pp.h" #include "pp.h"
#include <Control.h> #include <cplusplus/Control.h>
#include <QSet> #include <QSet>
#include <QString> #include <QString>
......
...@@ -28,15 +28,18 @@ ...@@ -28,15 +28,18 @@
****************************************************************************/ ****************************************************************************/
#include "FindUsages.h" #include "FindUsages.h"
#include "Overview.h" #include "Overview.h"
#include <AST.h>
#include <TranslationUnit.h> #include <cplusplus/AST.h>
#include <Control.h> #include <cplusplus/TranslationUnit.h>
#include <Names.h> #include <cplusplus/Control.h>
#include <Symbols.h> #include <cplusplus/Names.h>
#include <CoreTypes.h> #include <cplusplus/Symbols.h>
#include <Literals.h> #include <cplusplus/CoreTypes.h>
#include <Scope.h> #include <cplusplus/Literals.h>
#include <cplusplus/Scope.h>
#include <QDebug> #include <QDebug>
using namespace CPlusPlus; using namespace CPlusPlus;
......
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
#include "LookupContext.h" #include "LookupContext.h"
#include "CppDocument.h" #include "CppDocument.h"
#include "TypeOfExpression.h" #include "TypeOfExpression.h"
#include <ASTVisitor.h>
#include <cplusplus/ASTVisitor.h>
#include <QSet> #include <QSet>
namespace CPlusPlus { namespace CPlusPlus {
......
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
#include "Icons.h" #include "Icons.h"
#include <FullySpecifiedType.h> #include <cplusplus/FullySpecifiedType.h>
#include <Scope.h> #include <cplusplus/Scope.h>
#include <Symbols.h> #include <cplusplus/Symbols.h>
#include <Type.h> #include <cplusplus/Type.h>
using namespace CPlusPlus; using namespace CPlusPlus;
using CPlusPlus::Icons; using CPlusPlus::Icons;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#ifndef CPLUSPLUS_ICONS_H #ifndef CPLUSPLUS_ICONS_H
#define CPLUSPLUS_ICONS_H #define CPLUSPLUS_ICONS_H
#include "CPlusPlusForwardDeclarations.h" #include <cplusplus/CPlusPlusForwardDeclarations.h>
#include <QIcon> #include <QIcon>
......
...@@ -28,17 +28,18 @@ ...@@ -28,17 +28,18 @@
****************************************************************************/ ****************************************************************************/
#include "LookupContext.h" #include "LookupContext.h"
#include "ResolveExpression.h" #include "ResolveExpression.h"
#include "Overview.h" #include "Overview.h"
#include "DeprecatedGenTemplateInstance.h" #include "DeprecatedGenTemplateInstance.h"
#include "CppRewriter.h" #include "CppRewriter.h"
#include <CoreTypes.h> #include <cplusplus/CoreTypes.h>
#include <Symbols.h> #include <cplusplus/Symbols.h>
#include <Literals.h> #include <cplusplus/Literals.h>
#include <Names.h> #include <cplusplus/Names.h>
#include <Scope.h> #include <cplusplus/Scope.h>
#include <Control.h> #include <cplusplus/Control.h>
#include <QStack> #include <QStack>
#include <QHash> #include <QHash>
......
...@@ -33,15 +33,18 @@ ...@@ -33,15 +33,18 @@
#include "CppDocument.h" #include "CppDocument.h"
#include "LookupItem.h" #include "LookupItem.h"
#include "AlreadyConsideredClassContainer.h" #include "AlreadyConsideredClassContainer.h"
#include <FullySpecifiedType.h>
#include <Type.h> #include <cplusplus/FullySpecifiedType.h>
#include <SymbolVisitor.h> #include <cplusplus/Type.h>
#include <Control.h> #include <cplusplus/SymbolVisitor.h>
#include <Name.h> #include <cplusplus/Control.h>
#include <cplusplus/Name.h>
#include <QSet> #include <QSet>
#include <QMap>
#include <map> #include <map>
#include <functional> #include <functional>
#include <QMap>
namespace CPlusPlus { namespace CPlusPlus {
......
...@@ -28,9 +28,10 @@ ...@@ -28,9 +28,10 @@
****************************************************************************/ ****************************************************************************/
#include "LookupItem.h" #include "LookupItem.h"
#include <FullySpecifiedType.h>
#include <Symbol.h> #include <cplusplus/FullySpecifiedType.h>
#include <Control.h> #include <cplusplus/Symbol.h>
#include <cplusplus/Control.h>
#include <QDebug> #include <QDebug>
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#ifndef CPLUSPLUS_LOOKUPITEM_H #ifndef CPLUSPLUS_LOOKUPITEM_H
#define CPLUSPLUS_LOOKUPITEM_H #define CPLUSPLUS_LOOKUPITEM_H
#include <FullySpecifiedType.h> #include <cplusplus/FullySpecifiedType.h>
#include <QHash> #include <QHash>
namespace CPlusPlus { namespace CPlusPlus {
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "PPToken.h" #include "PPToken.h"
#include <CPlusPlusForwardDeclarations.h> #include <cplusplus/CPlusPlusForwardDeclarations.h>
#include <QByteArray> #include <QByteArray>
#include <QVector> #include <QVector>
......
...@@ -26,14 +26,15 @@ ...@@ -26,14 +26,15 @@
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** **
****************************************************************************/ ****************************************************************************/
#include "MatchingText.h" #include "MatchingText.h"
#include "BackwardsScanner.h" #include "BackwardsScanner.h"
#include <Token.h> #include <cplusplus/Token.h>
#include <QTextDocument> #include <QTextDocument>
#include <QTextCursor> #include <QTextCursor>
#include <QChar> #include <QChar>
#include <QDebug> #include <QDebug>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef CPLUSPLUS_MATCHINGTEXT_H #ifndef CPLUSPLUS_MATCHINGTEXT_H
#define CPLUSPLUS_MATCHINGTEXT_H #define CPLUSPLUS_MATCHINGTEXT_H
#include <CPlusPlusForwardDeclarations.h> #include <cplusplus/CPlusPlusForwardDeclarations.h>
QT_FORWARD_DECLARE_CLASS(QTextCursor) QT_FORWARD_DECLARE_CLASS(QTextCursor)
QT_FORWARD_DECLARE_CLASS(QChar) QT_FORWARD_DECLARE_CLASS(QChar)
......
...@@ -29,10 +29,11 @@ ...@@ -29,10 +29,11 @@
#include "NamePrettyPrinter.h" #include "NamePrettyPrinter.h"
#include <Names.h> #include "Overview.h"