Commit 79230320 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

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