summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/cplusplus')
-rw-r--r--src/libs/cplusplus/ASTParent.h4
-rw-r--r--src/libs/cplusplus/ASTPath.cpp2
-rw-r--r--src/libs/cplusplus/ASTPath.h4
-rw-r--r--src/libs/cplusplus/BackwardsScanner.cpp2
-rw-r--r--src/libs/cplusplus/BackwardsScanner.h2
-rw-r--r--src/libs/cplusplus/CppDocument.cpp8
-rw-r--r--src/libs/cplusplus/CppDocument.h10
-rw-r--r--src/libs/cplusplus/CppRewriter.cpp6
-rw-r--r--src/libs/cplusplus/DependencyTable.cpp2
-rw-r--r--src/libs/cplusplus/DependencyTable.h10
-rw-r--r--src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp4
-rw-r--r--src/libs/cplusplus/DeprecatedGenTemplateInstance.h6
-rw-r--r--src/libs/cplusplus/ExpressionUnderCursor.h2
-rw-r--r--src/libs/cplusplus/FastPreprocessor.cpp2
-rw-r--r--src/libs/cplusplus/FastPreprocessor.h4
-rw-r--r--src/libs/cplusplus/FindUsages.h2
-rw-r--r--src/libs/cplusplus/Icons.h2
-rw-r--r--src/libs/cplusplus/LookupContext.cpp8
-rw-r--r--src/libs/cplusplus/LookupContext.h2
-rw-r--r--src/libs/cplusplus/LookupItem.h2
-rw-r--r--src/libs/cplusplus/Macro.h6
-rw-r--r--src/libs/cplusplus/MatchingText.cpp8
-rw-r--r--src/libs/cplusplus/ModelManagerInterface.h10
-rw-r--r--src/libs/cplusplus/NamePrettyPrinter.h2
-rw-r--r--src/libs/cplusplus/Overview.h4
-rw-r--r--src/libs/cplusplus/OverviewModel.cpp4
-rw-r--r--src/libs/cplusplus/OverviewModel.h2
-rw-r--r--src/libs/cplusplus/ResolveExpression.cpp6
-rw-r--r--src/libs/cplusplus/SnapshotSymbolVisitor.h2
-rw-r--r--src/libs/cplusplus/TypeHierarchyBuilder.h6
-rw-r--r--src/libs/cplusplus/TypeOfExpression.h8
-rw-r--r--src/libs/cplusplus/pp-engine.cpp2
32 files changed, 72 insertions, 72 deletions
diff --git a/src/libs/cplusplus/ASTParent.h b/src/libs/cplusplus/ASTParent.h
index b2c04a2ac2..44ff7df659 100644
--- a/src/libs/cplusplus/ASTParent.h
+++ b/src/libs/cplusplus/ASTParent.h
@@ -34,8 +34,8 @@
#define CPLUSPLUS_ASTPARENT_H
#include <ASTVisitor.h>
-#include <QtCore/QHash>
-#include <QtCore/QStack>
+#include <QHash>
+#include <QStack>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/ASTPath.cpp b/src/libs/cplusplus/ASTPath.cpp
index 9b3e48eb70..d6f90c76f6 100644
--- a/src/libs/cplusplus/ASTPath.cpp
+++ b/src/libs/cplusplus/ASTPath.cpp
@@ -36,7 +36,7 @@
#include <TranslationUnit.h>
#ifdef DEBUG_AST_PATH
-# include <QtCore/QDebug>
+# include <QDebug>
# include <typeinfo>
#endif // DEBUG_AST_PATH
diff --git a/src/libs/cplusplus/ASTPath.h b/src/libs/cplusplus/ASTPath.h
index d91ff34951..3587e8c7ce 100644
--- a/src/libs/cplusplus/ASTPath.h
+++ b/src/libs/cplusplus/ASTPath.h
@@ -38,8 +38,8 @@
#include "CppDocument.h"
-#include <QtCore/QList>
-#include <QtGui/QTextCursor>
+#include <QList>
+#include <QTextCursor>
#undef DEBUG_AST_PATH
diff --git a/src/libs/cplusplus/BackwardsScanner.cpp b/src/libs/cplusplus/BackwardsScanner.cpp
index 2c3a312c93..c38260151c 100644
--- a/src/libs/cplusplus/BackwardsScanner.cpp
+++ b/src/libs/cplusplus/BackwardsScanner.cpp
@@ -31,7 +31,7 @@
**************************************************************************/
#include "BackwardsScanner.h"
#include <Token.h>
-#include <QtGui/QTextCursor>
+#include <QTextCursor>
#include <QTextDocument>
using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/BackwardsScanner.h b/src/libs/cplusplus/BackwardsScanner.h
index 34d698e86f..24fad65140 100644
--- a/src/libs/cplusplus/BackwardsScanner.h
+++ b/src/libs/cplusplus/BackwardsScanner.h
@@ -34,7 +34,7 @@
#include "SimpleLexer.h"
-#include <QtGui/QTextBlock>
+#include <QTextBlock>
QT_FORWARD_DECLARE_CLASS(QTextCursor)
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 611f0e1ea8..0c0f7c2e93 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -52,10 +52,10 @@
#include <CoreTypes.h>
#include <LookupContext.h>
-#include <QtCore/QByteArray>
-#include <QtCore/QBitArray>
-#include <QtCore/QDir>
-#include <QtCore/QtDebug>
+#include <QByteArray>
+#include <QBitArray>
+#include <QDir>
+#include <QtDebug>
/*!
\namespace CPlusPlus
diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index ca81fe1bd2..258d86138b 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -36,11 +36,11 @@
#include <CPlusPlusForwardDeclarations.h>
#include "Macro.h"
-#include <QtCore/QSharedPointer>
-#include <QtCore/QDateTime>
-#include <QtCore/QHash>
-#include <QtCore/QFileInfo>
-#include <QtCore/QAtomicInt>
+#include <QSharedPointer>
+#include <QDateTime>
+#include <QHash>
+#include <QFileInfo>
+#include <QAtomicInt>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp
index 9a2d7b0482..0dfa030cfc 100644
--- a/src/libs/cplusplus/CppRewriter.cpp
+++ b/src/libs/cplusplus/CppRewriter.cpp
@@ -39,9 +39,9 @@
#include <Scope.h>
#include <Overview.h>
-#include <QtCore/QVarLengthArray>
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
+#include <QVarLengthArray>
+#include <QRegExp>
+#include <QDebug>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/DependencyTable.cpp b/src/libs/cplusplus/DependencyTable.cpp
index 5c0b208ec3..478355f675 100644
--- a/src/libs/cplusplus/DependencyTable.cpp
+++ b/src/libs/cplusplus/DependencyTable.cpp
@@ -33,7 +33,7 @@
#include "DependencyTable.h"
#include "CppDocument.h"
-#include <QtCore/QDebug>
+#include <QDebug>
using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/DependencyTable.h b/src/libs/cplusplus/DependencyTable.h
index aea559407f..6b97a57bb3 100644
--- a/src/libs/cplusplus/DependencyTable.h
+++ b/src/libs/cplusplus/DependencyTable.h
@@ -35,11 +35,11 @@
#include <CPlusPlusForwardDeclarations.h>
-#include <QtCore/QBitArray>
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QBitArray>
+#include <QHash>
+#include <QString>
+#include <QStringList>
+#include <QVector>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
index 26ad1a9e36..e3eb67653c 100644
--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
@@ -40,8 +40,8 @@
#include <CoreTypes.h>
#include <Literals.h>
-#include <QtCore/QVarLengthArray>
-#include <QtCore/QDebug>
+#include <QVarLengthArray>
+#include <QDebug>
using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
index 4c387e9e93..778fcf0d8d 100644
--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
@@ -37,9 +37,9 @@
#include <NameVisitor.h>
#include <FullySpecifiedType.h>
-#include <QtCore/QList>
-#include <QtCore/QPair>
-#include <QtCore/QSharedPointer>
+#include <QList>
+#include <QPair>
+#include <QSharedPointer>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.h b/src/libs/cplusplus/ExpressionUnderCursor.h
index 2ec85fb0c3..a6bea04201 100644
--- a/src/libs/cplusplus/ExpressionUnderCursor.h
+++ b/src/libs/cplusplus/ExpressionUnderCursor.h
@@ -34,7 +34,7 @@
#define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
#include "CPlusPlusForwardDeclarations.h"
-#include <QtCore/QList>
+#include <QList>
QT_BEGIN_NAMESPACE
class QString;
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp
index 75a9210456..ff8896283b 100644
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -33,7 +33,7 @@
#include "FastPreprocessor.h"
#include <Literals.h>
#include <TranslationUnit.h>
-#include <QtCore/QDebug>
+#include <QDebug>
using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h
index f04e5edc4b..b032b6af27 100644
--- a/src/libs/cplusplus/FastPreprocessor.h
+++ b/src/libs/cplusplus/FastPreprocessor.h
@@ -39,8 +39,8 @@
#include <Control.h>
-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <QSet>
+#include <QString>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/FindUsages.h b/src/libs/cplusplus/FindUsages.h
index 99d5ac25b9..cdc4b8e7e5 100644
--- a/src/libs/cplusplus/FindUsages.h
+++ b/src/libs/cplusplus/FindUsages.h
@@ -37,7 +37,7 @@
#include "CppDocument.h"
#include "TypeOfExpression.h"
#include <ASTVisitor.h>
-#include <QtCore/QSet>
+#include <QSet>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/Icons.h b/src/libs/cplusplus/Icons.h
index 51e4c65412..88b42d9a23 100644
--- a/src/libs/cplusplus/Icons.h
+++ b/src/libs/cplusplus/Icons.h
@@ -35,7 +35,7 @@
#include "CPlusPlusForwardDeclarations.h"
-#include <QtGui/QIcon>
+#include <QIcon>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index b9ffa9d10b..556eced68d 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -42,10 +42,10 @@
#include <Scope.h>
#include <Control.h>
-#include <QtCore/QStack>
-#include <QtCore/QHash>
-#include <QtCore/QVarLengthArray>
-#include <QtCore/QtDebug>
+#include <QStack>
+#include <QHash>
+#include <QVarLengthArray>
+#include <QtDebug>
using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h
index d1bc2f34fb..901dfc0953 100644
--- a/src/libs/cplusplus/LookupContext.h
+++ b/src/libs/cplusplus/LookupContext.h
@@ -40,7 +40,7 @@
#include <SymbolVisitor.h>
#include <Control.h>
#include <Name.h>
-#include <QtCore/QSet>
+#include <QSet>
#include <map>
#include <functional>
diff --git a/src/libs/cplusplus/LookupItem.h b/src/libs/cplusplus/LookupItem.h
index 85dca22edb..784f01e474 100644
--- a/src/libs/cplusplus/LookupItem.h
+++ b/src/libs/cplusplus/LookupItem.h
@@ -34,7 +34,7 @@
#define CPLUSPLUS_LOOKUPITEM_H
#include <FullySpecifiedType.h>
-#include <QtCore/QHash>
+#include <QHash>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h
index 7c3c2376bc..004969333f 100644
--- a/src/libs/cplusplus/Macro.h
+++ b/src/libs/cplusplus/Macro.h
@@ -54,9 +54,9 @@
#include <CPlusPlusForwardDeclarations.h>
-#include <QtCore/QByteArray>
-#include <QtCore/QVector>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QVector>
+#include <QString>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp
index 236b6fbf90..c0847bc595 100644
--- a/src/libs/cplusplus/MatchingText.cpp
+++ b/src/libs/cplusplus/MatchingText.cpp
@@ -34,11 +34,11 @@
#include <Token.h>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextCursor>
+#include <QTextDocument>
+#include <QTextCursor>
-#include <QtCore/QChar>
-#include <QtCore/QtDebug>
+#include <QChar>
+#include <QtDebug>
using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/ModelManagerInterface.h b/src/libs/cplusplus/ModelManagerInterface.h
index 564bbfae8c..a057a601da 100644
--- a/src/libs/cplusplus/ModelManagerInterface.h
+++ b/src/libs/cplusplus/ModelManagerInterface.h
@@ -35,11 +35,11 @@
#include <cplusplus/CppDocument.h>
#include <languageutils/fakemetaobject.h>
-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QPointer>
-#include <QtCore/QStringList>
-#include <QtCore/QFuture>
+#include <QObject>
+#include <QHash>
+#include <QPointer>
+#include <QStringList>
+#include <QFuture>
namespace Core {
class IEditor;
diff --git a/src/libs/cplusplus/NamePrettyPrinter.h b/src/libs/cplusplus/NamePrettyPrinter.h
index a3071b086e..00bd66155d 100644
--- a/src/libs/cplusplus/NamePrettyPrinter.h
+++ b/src/libs/cplusplus/NamePrettyPrinter.h
@@ -34,7 +34,7 @@
#define CPLUSPLUS_NAMEPRETTYPRINTER_H
#include <NameVisitor.h>
-#include <QtCore/QString>
+#include <QString>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h
index 4d363aa710..aa04f818ae 100644
--- a/src/libs/cplusplus/Overview.h
+++ b/src/libs/cplusplus/Overview.h
@@ -35,8 +35,8 @@
#include <CPlusPlusForwardDeclarations.h>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp
index 7618235f05..2a2ba9560b 100644
--- a/src/libs/cplusplus/OverviewModel.cpp
+++ b/src/libs/cplusplus/OverviewModel.cpp
@@ -37,8 +37,8 @@
#include <Literals.h>
#include <Symbols.h>
-#include <QtCore/QFile>
-#include <QtCore/QtDebug>
+#include <QFile>
+#include <QtDebug>
using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/OverviewModel.h b/src/libs/cplusplus/OverviewModel.h
index 9fe52dd378..19839f8e71 100644
--- a/src/libs/cplusplus/OverviewModel.h
+++ b/src/libs/cplusplus/OverviewModel.h
@@ -37,7 +37,7 @@
#include "Overview.h"
#include "Icons.h"
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 5db83fe873..4678d014f6 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -48,9 +48,9 @@
#include <NameVisitor.h>
#include <Templates.h>
-#include <QtCore/QList>
-#include <QtCore/QtDebug>
-#include <QtCore/QSet>
+#include <QList>
+#include <QtDebug>
+#include <QSet>
using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/SnapshotSymbolVisitor.h b/src/libs/cplusplus/SnapshotSymbolVisitor.h
index 5b39dea3a1..7fe92d1a8a 100644
--- a/src/libs/cplusplus/SnapshotSymbolVisitor.h
+++ b/src/libs/cplusplus/SnapshotSymbolVisitor.h
@@ -35,7 +35,7 @@
#include "CppDocument.h"
#include <SymbolVisitor.h>
-#include <QtCore/QSet>
+#include <QSet>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/TypeHierarchyBuilder.h b/src/libs/cplusplus/TypeHierarchyBuilder.h
index 2980103af2..1fd8a82016 100644
--- a/src/libs/cplusplus/TypeHierarchyBuilder.h
+++ b/src/libs/cplusplus/TypeHierarchyBuilder.h
@@ -37,9 +37,9 @@
#include "ModelManagerInterface.h"
#include "Overview.h"
-#include <QtCore/QList>
-#include <QtCore/QStringList>
-#include <QtCore/QSet>
+#include <QList>
+#include <QStringList>
+#include <QSet>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/TypeOfExpression.h b/src/libs/cplusplus/TypeOfExpression.h
index d5413e823c..e3b447fe5c 100644
--- a/src/libs/cplusplus/TypeOfExpression.h
+++ b/src/libs/cplusplus/TypeOfExpression.h
@@ -37,10 +37,10 @@
#include "PreprocessorEnvironment.h"
#include <ASTfwd.h>
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QByteArray>
+#include <QMap>
+#include <QObject>
+#include <QString>
+#include <QByteArray>
namespace CPlusPlus {
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 68b75df301..af27609f84 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -59,7 +59,7 @@
#include <QtDebug>
#include <algorithm>
-#include <QtCore/QList>
+#include <QList>
namespace CPlusPlus {