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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment