diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 10:42:41 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 16:24:46 +0100 |
| commit | 3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8 (patch) | |
| tree | e31dbd1b4605530e59c9864166f155b4edabc721 /src/libs | |
| parent | 9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff) | |
| download | qt-creator-3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8.tar.gz | |
Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/libs')
343 files changed, 1012 insertions, 1012 deletions
diff --git a/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h b/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h index c6ded0a4a4..5c24b2ee3c 100644 --- a/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h +++ b/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h @@ -25,7 +25,7 @@ #include <cstddef> #ifndef CPLUSPLUS_WITHOUT_QT -# include <QtCore/qglobal.h> +# include <qglobal.h> # if defined(CPLUSPLUS_BUILD_LIB) # define CPLUSPLUS_EXPORT Q_DECL_EXPORT diff --git a/src/libs/3rdparty/precompiled_headers/botan_pch.h b/src/libs/3rdparty/precompiled_headers/botan_pch.h index 15aef14388..e2ea3c4628 100644 --- a/src/libs/3rdparty/precompiled_headers/botan_pch.h +++ b/src/libs/3rdparty/precompiled_headers/botan_pch.h @@ -31,7 +31,7 @@ **************************************************************************/ #if defined __cplusplus -#include <QtCore/QtGlobal> +#include <QtGlobal> #ifdef Q_WS_WIN # define _POSIX_ diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp index 0bd0a6cc5b..4f28f2577b 100644 --- a/src/libs/aggregation/aggregate.cpp +++ b/src/libs/aggregation/aggregate.cpp @@ -32,8 +32,8 @@ #include "aggregate.h" -#include <QtCore/QWriteLocker> -#include <QtCore/QDebug> +#include <QWriteLocker> +#include <QDebug> /*! \namespace Aggregation diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index 46d36afa16..ec9d158cc2 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -35,11 +35,11 @@ #include "aggregation_global.h" -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QHash> -#include <QtCore/QReadWriteLock> -#include <QtCore/QReadLocker> +#include <QObject> +#include <QList> +#include <QHash> +#include <QReadWriteLock> +#include <QReadLocker> namespace Aggregation { diff --git a/src/libs/aggregation/aggregation_global.h b/src/libs/aggregation/aggregation_global.h index f331f798ec..c65a4adc71 100644 --- a/src/libs/aggregation/aggregation_global.h +++ b/src/libs/aggregation/aggregation_global.h @@ -33,7 +33,7 @@ #ifndef AGGREGATION_GLOBAL_H #define AGGREGATION_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(AGGREGATION_LIBRARY) # define AGGREGATION_EXPORT Q_DECL_EXPORT diff --git a/src/libs/aggregation/examples/text/main.cpp b/src/libs/aggregation/examples/text/main.cpp index fda5deef10..ba50af8340 100644 --- a/src/libs/aggregation/examples/text/main.cpp +++ b/src/libs/aggregation/examples/text/main.cpp @@ -32,7 +32,7 @@ #include "main.h" -#include <QtGui/QApplication> +#include <QApplication> MyMain::MyMain(QWidget *parent, Qt::WFlags flags) : QWidget(parent, flags) diff --git a/src/libs/aggregation/examples/text/main.h b/src/libs/aggregation/examples/text/main.h index d6290e941a..09ab264a73 100644 --- a/src/libs/aggregation/examples/text/main.h +++ b/src/libs/aggregation/examples/text/main.h @@ -38,7 +38,7 @@ #include <aggregate.h> -#include <QtGui/QWidget> +#include <QWidget> class MyMain : public QWidget { diff --git a/src/libs/aggregation/examples/text/myinterfaces.h b/src/libs/aggregation/examples/text/myinterfaces.h index 686f997218..c01ffa9ab9 100644 --- a/src/libs/aggregation/examples/text/myinterfaces.h +++ b/src/libs/aggregation/examples/text/myinterfaces.h @@ -35,7 +35,7 @@ #include <aggregate.h> -#include <QtCore/QString> +#include <QString> class IComboEntry : public QObject { 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 { diff --git a/src/libs/extensionsystem/extensionsystem_global.h b/src/libs/extensionsystem/extensionsystem_global.h index 460c51ff01..e945b9a01b 100644 --- a/src/libs/extensionsystem/extensionsystem_global.h +++ b/src/libs/extensionsystem/extensionsystem_global.h @@ -33,7 +33,7 @@ #ifndef EXTENSIONSYSTEM_GLOBAL_H #define EXTENSIONSYSTEM_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(EXTENSIONSYSTEM_LIBRARY) # define EXTENSIONSYSTEM_EXPORT Q_DECL_EXPORT diff --git a/src/libs/extensionsystem/invoker.h b/src/libs/extensionsystem/invoker.h index b509cd7e4c..6ecbf3a3ac 100644 --- a/src/libs/extensionsystem/invoker.h +++ b/src/libs/extensionsystem/invoker.h @@ -35,10 +35,10 @@ #include "extensionsystem_global.h" -#include <QtCore/QMetaMethod> -#include <QtCore/QMetaObject> -#include <QtCore/QMetaType> -#include <QtCore/QVarLengthArray> +#include <QMetaMethod> +#include <QMetaObject> +#include <QMetaType> +#include <QVarLengthArray> namespace ExtensionSystem { diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h index 8d251820fd..37f474a09c 100644 --- a/src/libs/extensionsystem/iplugin.h +++ b/src/libs/extensionsystem/iplugin.h @@ -35,7 +35,7 @@ #include "extensionsystem_global.h" -#include <QtCore/QObject> +#include <QObject> namespace ExtensionSystem { diff --git a/src/libs/extensionsystem/iplugin_p.h b/src/libs/extensionsystem/iplugin_p.h index 79aef585e8..6f5f632715 100644 --- a/src/libs/extensionsystem/iplugin_p.h +++ b/src/libs/extensionsystem/iplugin_p.h @@ -35,7 +35,7 @@ #include "iplugin.h" -#include <QtCore/QString> +#include <QString> namespace ExtensionSystem { diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp index 64fc7bfd46..644eb83d44 100644 --- a/src/libs/extensionsystem/optionsparser.cpp +++ b/src/libs/extensionsystem/optionsparser.cpp @@ -32,7 +32,7 @@ #include "optionsparser.h" -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace ExtensionSystem; using namespace ExtensionSystem::Internal; diff --git a/src/libs/extensionsystem/optionsparser.h b/src/libs/extensionsystem/optionsparser.h index 5c1a8dcb90..4abdd41a02 100644 --- a/src/libs/extensionsystem/optionsparser.h +++ b/src/libs/extensionsystem/optionsparser.h @@ -35,8 +35,8 @@ #include "pluginmanager_p.h" -#include <QtCore/QStringList> -#include <QtCore/QMap> +#include <QStringList> +#include <QMap> namespace ExtensionSystem { namespace Internal { diff --git a/src/libs/extensionsystem/plugincollection.h b/src/libs/extensionsystem/plugincollection.h index 145185bd37..d73b2f10be 100644 --- a/src/libs/extensionsystem/plugincollection.h +++ b/src/libs/extensionsystem/plugincollection.h @@ -35,8 +35,8 @@ #include "extensionsystem_global.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> namespace ExtensionSystem { class PluginSpec; diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp index e28de22520..dd6183a9a9 100644 --- a/src/libs/extensionsystem/plugindetailsview.cpp +++ b/src/libs/extensionsystem/plugindetailsview.cpp @@ -34,7 +34,7 @@ #include "ui_plugindetailsview.h" #include "pluginspec.h" -#include <QtCore/QDir> +#include <QDir> /*! \class ExtensionSystem::PluginDetailsView diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h index df8c47dc2f..7fdcc49480 100644 --- a/src/libs/extensionsystem/plugindetailsview.h +++ b/src/libs/extensionsystem/plugindetailsview.h @@ -35,7 +35,7 @@ #include "extensionsystem_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace ExtensionSystem { diff --git a/src/libs/extensionsystem/pluginerroroverview.h b/src/libs/extensionsystem/pluginerroroverview.h index 5d6160041b..148b67bed3 100644 --- a/src/libs/extensionsystem/pluginerroroverview.h +++ b/src/libs/extensionsystem/pluginerroroverview.h @@ -35,7 +35,7 @@ #include "extensionsystem_global.h" -#include <QtGui/QDialog> +#include <QDialog> namespace ExtensionSystem { diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp index 7b62d57804..ac3a52318a 100644 --- a/src/libs/extensionsystem/pluginerrorview.cpp +++ b/src/libs/extensionsystem/pluginerrorview.cpp @@ -34,7 +34,7 @@ #include "ui_pluginerrorview.h" #include "pluginspec.h" -#include <QtCore/QString> +#include <QString> /*! \class ExtensionSystem::PluginErrorView diff --git a/src/libs/extensionsystem/pluginerrorview.h b/src/libs/extensionsystem/pluginerrorview.h index c8d568a5fa..d24ec88c10 100644 --- a/src/libs/extensionsystem/pluginerrorview.h +++ b/src/libs/extensionsystem/pluginerrorview.h @@ -35,7 +35,7 @@ #include "extensionsystem_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace ExtensionSystem { diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 9420af85b4..e3164f0412 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -38,16 +38,16 @@ #include "iplugin.h" #include "plugincollection.h" -#include <QtCore/QEventLoop> -#include <QtCore/QDateTime> -#include <QtCore/QDir> -#include <QtCore/QMetaProperty> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtCore/QTime> -#include <QtCore/QWriteLocker> -#include <QtCore/QtDebug> -#include <QtCore/QTimer> +#include <QEventLoop> +#include <QDateTime> +#include <QDir> +#include <QMetaProperty> +#include <QSettings> +#include <QTextStream> +#include <QTime> +#include <QWriteLocker> +#include <QtDebug> +#include <QTimer> #ifdef WITH_TESTS #include <QTest> diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h index 32878f3a1f..b0d555dd64 100644 --- a/src/libs/extensionsystem/pluginmanager.h +++ b/src/libs/extensionsystem/pluginmanager.h @@ -36,9 +36,9 @@ #include "extensionsystem_global.h" #include <aggregation/aggregate.h> -#include <QtCore/QObject> -#include <QtCore/QReadWriteLock> -#include <QtCore/QStringList> +#include <QObject> +#include <QReadWriteLock> +#include <QStringList> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h index be33e8ad79..72af52c2f2 100644 --- a/src/libs/extensionsystem/pluginmanager_p.h +++ b/src/libs/extensionsystem/pluginmanager_p.h @@ -35,10 +35,10 @@ #include "pluginspec.h" -#include <QtCore/QSet> -#include <QtCore/QStringList> -#include <QtCore/QObject> -#include <QtCore/QScopedPointer> +#include <QSet> +#include <QStringList> +#include <QObject> +#include <QScopedPointer> QT_BEGIN_NAMESPACE class QTime; diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp index 57c5899203..3f2bc55c09 100644 --- a/src/libs/extensionsystem/pluginspec.cpp +++ b/src/libs/extensionsystem/pluginspec.cpp @@ -37,12 +37,12 @@ #include "iplugin_p.h" #include "pluginmanager.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QRegExp> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QXmlStreamReader> +#include <QRegExp> +#include <QCoreApplication> #include <QtDebug> #ifdef Q_OS_LINUX @@ -54,7 +54,7 @@ #if USE_UNPATCHED_QPLUGINLOADER -# include <QtCore/QPluginLoader> +# include <QPluginLoader> typedef QT_PREPEND_NAMESPACE(QPluginLoader) PluginLoader; #else diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h index ad798dc115..cb947ef11c 100644 --- a/src/libs/extensionsystem/pluginspec.h +++ b/src/libs/extensionsystem/pluginspec.h @@ -35,9 +35,9 @@ #include "extensionsystem_global.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QHash> +#include <QString> +#include <QList> +#include <QHash> QT_BEGIN_NAMESPACE class QStringList; diff --git a/src/libs/extensionsystem/pluginspec_p.h b/src/libs/extensionsystem/pluginspec_p.h index 2ae53438e1..f5b422fdee 100644 --- a/src/libs/extensionsystem/pluginspec_p.h +++ b/src/libs/extensionsystem/pluginspec_p.h @@ -36,9 +36,9 @@ #include "pluginspec.h" #include "iplugin.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QXmlStreamReader> +#include <QObject> +#include <QStringList> +#include <QXmlStreamReader> namespace ExtensionSystem { diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index d20ff316df..29079b3ff1 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -37,10 +37,10 @@ #include "plugincollection.h" #include "ui_pluginview.h" -#include <QtCore/QDir> -#include <QtGui/QHeaderView> -#include <QtGui/QTreeWidgetItem> -#include <QtGui/QPalette> +#include <QDir> +#include <QHeaderView> +#include <QTreeWidgetItem> +#include <QPalette> #include <QtDebug> diff --git a/src/libs/extensionsystem/pluginview.h b/src/libs/extensionsystem/pluginview.h index df82a1cc22..c0ee0501b5 100644 --- a/src/libs/extensionsystem/pluginview.h +++ b/src/libs/extensionsystem/pluginview.h @@ -35,9 +35,9 @@ #include "extensionsystem_global.h" -#include <QtCore/QHash> -#include <QtGui/QWidget> -#include <QtGui/QIcon> +#include <QHash> +#include <QWidget> +#include <QIcon> QT_BEGIN_NAMESPACE class QTreeWidgetItem; diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp index 67537648f2..00927c4702 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp @@ -36,11 +36,11 @@ #include <extensionsystem/pluginerrorview.h> #include <extensionsystem/pluginspec.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QApplication> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QDialog> +#include <QDialogButtonBox> +#include <QApplication> #include <QtDebug> PluginDialog::PluginDialog(ExtensionSystem::PluginManager *manager) diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h index 4bfc89d33e..f7a12bf286 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h @@ -36,8 +36,8 @@ #include <extensionsystem/pluginview.h> #include <extensionsystem/pluginmanager.h> -#include <QtGui/QWidget> -#include <QtGui/QPushButton> +#include <QWidget> +#include <QPushButton> class PluginDialog : public QWidget { diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp index 9da129ed35..4b9bb3f31e 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp @@ -34,8 +34,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/qplugin.h> -#include <QtCore/QObject> +#include <qplugin.h> +#include <QObject> using namespace Plugin1; diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h index c8867fc485..1e7f3885e4 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h @@ -35,8 +35,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> namespace Plugin1 { diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp index ccd1c55cf3..ccfef43cec 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp @@ -34,8 +34,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/qplugin.h> -#include <QtCore/QObject> +#include <qplugin.h> +#include <QObject> using namespace Plugin2; diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h index 9e1ac6a6a8..19fe90c835 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h @@ -35,8 +35,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> namespace Plugin2 { diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp index fba7a29110..705fed1b01 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp @@ -34,8 +34,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/qplugin.h> -#include <QtCore/QObject> +#include <qplugin.h> +#include <QObject> using namespace Plugin3; diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h index 50d4982d25..35e2d6662b 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h @@ -35,8 +35,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> namespace Plugin3 { diff --git a/src/libs/glsl/glsl.h b/src/libs/glsl/glsl.h index 932789f2d0..1c36a669f6 100644 --- a/src/libs/glsl/glsl.h +++ b/src/libs/glsl/glsl.h @@ -33,7 +33,7 @@ #ifndef GLSL_H #define GLSL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #include <cstdlib> #include <cstddef> diff --git a/src/libs/glsl/glslast.h b/src/libs/glsl/glslast.h index a780f3f2fa..85bd8dee98 100644 --- a/src/libs/glsl/glslast.h +++ b/src/libs/glsl/glslast.h @@ -35,7 +35,7 @@ #include "glsl.h" #include "glslmemorypool.h" -#include <QtCore/qstring.h> +#include <qstring.h> namespace GLSL { diff --git a/src/libs/glsl/glslastdump.cpp b/src/libs/glsl/glslastdump.cpp index 0dfc88f135..a58006f65c 100644 --- a/src/libs/glsl/glslastdump.cpp +++ b/src/libs/glsl/glslastdump.cpp @@ -31,7 +31,7 @@ **************************************************************************/ #include "glslastdump.h" -#include <QtCore/QTextStream> +#include <QTextStream> #include <typeinfo> diff --git a/src/libs/glsl/glslengine.h b/src/libs/glsl/glslengine.h index 3c98dbcc05..29b4f7bfef 100644 --- a/src/libs/glsl/glslengine.h +++ b/src/libs/glsl/glslengine.h @@ -36,8 +36,8 @@ #include "glsl.h" #include "glslmemorypool.h" #include "glsltypes.h" -#include <QtCore/qstring.h> -#include <QtCore/qset.h> +#include <qstring.h> +#include <qset.h> #include <functional> #include <set> diff --git a/src/libs/glsl/glsllexer.cpp b/src/libs/glsl/glsllexer.cpp index a6d75993c2..bb6ef82168 100644 --- a/src/libs/glsl/glsllexer.cpp +++ b/src/libs/glsl/glsllexer.cpp @@ -33,7 +33,7 @@ #include "glsllexer.h" #include "glslparser.h" #include "glslengine.h" -#include <QtCore/qbytearray.h> +#include <qbytearray.h> #include <cctype> #include <iostream> #include <cstdio> diff --git a/src/libs/glsl/glsllexer.h b/src/libs/glsl/glsllexer.h index dc1428e765..e39b31b0a5 100644 --- a/src/libs/glsl/glsllexer.h +++ b/src/libs/glsl/glsllexer.h @@ -34,8 +34,8 @@ #define GLSLLEXER_H #include "glsl.h" -#include <QtCore/qstring.h> -#include <QtCore/qstringlist.h> +#include <qstring.h> +#include <qstringlist.h> namespace GLSL { diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp index f93f1cca02..60afaa3eb1 100644 --- a/src/libs/glsl/glslparser.cpp +++ b/src/libs/glsl/glslparser.cpp @@ -38,7 +38,7 @@ #include <iostream> #include <cstdio> #include <cassert> -#include <QtCore/QDebug> +#include <QDebug> using namespace GLSL; diff --git a/src/libs/glsl/glslparsertable_p.h b/src/libs/glsl/glslparsertable_p.h index db796e3bbf..1bbecdd6cb 100644 --- a/src/libs/glsl/glslparsertable_p.h +++ b/src/libs/glsl/glslparsertable_p.h @@ -45,7 +45,7 @@ #ifndef GLSLPARSERTABLE_P_H #define GLSLPARSERTABLE_P_H -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/libs/glsl/glslsemantic.cpp b/src/libs/glsl/glslsemantic.cpp index 043d7d8df7..3729437da1 100644 --- a/src/libs/glsl/glslsemantic.cpp +++ b/src/libs/glsl/glslsemantic.cpp @@ -35,7 +35,7 @@ #include "glslparser.h" #include "glslsymbols.h" #include "glsltypes.h" -#include <QtCore/QDebug> +#include <QDebug> using namespace GLSL; diff --git a/src/libs/glsl/glslsymbol.cpp b/src/libs/glsl/glslsymbol.cpp index a98dd04e27..5ac2e43ef3 100644 --- a/src/libs/glsl/glslsymbol.cpp +++ b/src/libs/glsl/glslsymbol.cpp @@ -31,7 +31,7 @@ **************************************************************************/ #include "glslsymbol.h" -#include <QtCore/QStringList> +#include <QStringList> using namespace GLSL; diff --git a/src/libs/glsl/glslsymbol.h b/src/libs/glsl/glslsymbol.h index ffb65939d6..8ecf1113d5 100644 --- a/src/libs/glsl/glslsymbol.h +++ b/src/libs/glsl/glslsymbol.h @@ -34,7 +34,7 @@ #define GLSLSYMBOL_H #include "glsl.h" -#include <QtCore/QString> +#include <QString> namespace GLSL { diff --git a/src/libs/glsl/glslsymbols.cpp b/src/libs/glsl/glslsymbols.cpp index 6cc735993c..4f7bac243a 100644 --- a/src/libs/glsl/glslsymbols.cpp +++ b/src/libs/glsl/glslsymbols.cpp @@ -32,7 +32,7 @@ #include "glsltypes.h" #include "glslsymbols.h" -#include <QtCore/QDebug> +#include <QDebug> using namespace GLSL; diff --git a/src/libs/glsl/glslsymbols.h b/src/libs/glsl/glslsymbols.h index 51d1882ff3..a9f1451c48 100644 --- a/src/libs/glsl/glslsymbols.h +++ b/src/libs/glsl/glslsymbols.h @@ -35,9 +35,9 @@ #include "glsltype.h" #include "glslsymbol.h" -#include <QtCore/QVector> -#include <QtCore/QString> -#include <QtCore/QHash> +#include <QVector> +#include <QString> +#include <QHash> namespace GLSL { diff --git a/src/libs/glsl/glsltypes.h b/src/libs/glsl/glsltypes.h index 4659c303be..fd11cc231f 100644 --- a/src/libs/glsl/glsltypes.h +++ b/src/libs/glsl/glsltypes.h @@ -35,10 +35,10 @@ #include "glsltype.h" #include "glslsymbol.h" -#include <QtCore/QVector> -#include <QtCore/QHash> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QVector> +#include <QHash> +#include <QString> +#include <QStringList> namespace GLSL { diff --git a/src/libs/languageutils/componentversion.cpp b/src/libs/languageutils/componentversion.cpp index 29e51027b8..6be8a45235 100644 --- a/src/libs/languageutils/componentversion.cpp +++ b/src/libs/languageutils/componentversion.cpp @@ -32,7 +32,7 @@ #include "componentversion.h" -#include <QtCore/QString> +#include <QString> #include <limits> diff --git a/src/libs/languageutils/fakemetaobject.h b/src/libs/languageutils/fakemetaobject.h index a53174fadf..0156f03a19 100644 --- a/src/libs/languageutils/fakemetaobject.h +++ b/src/libs/languageutils/fakemetaobject.h @@ -36,11 +36,11 @@ #include "languageutils_global.h" #include "componentversion.h" -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QList> -#include <QtCore/QHash> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QStringList> +#include <QList> +#include <QHash> +#include <QSharedPointer> namespace LanguageUtils { diff --git a/src/libs/languageutils/languageutils_global.h b/src/libs/languageutils/languageutils_global.h index 7ae3d4594a..e8a60d04db 100644 --- a/src/libs/languageutils/languageutils_global.h +++ b/src/libs/languageutils/languageutils_global.h @@ -33,7 +33,7 @@ #ifndef LANGUAGEUTILS_GLOBAL_H #define LANGUAGEUTILS_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(LANGUAGEUTILS_BUILD_DIR) # define LANGUAGEUTILS_EXPORT Q_DECL_EXPORT diff --git a/src/libs/qmleditorwidgets/colorbox.cpp b/src/libs/qmleditorwidgets/colorbox.cpp index 3f280cb8ba..f17fd3fa83 100644 --- a/src/libs/qmleditorwidgets/colorbox.cpp +++ b/src/libs/qmleditorwidgets/colorbox.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "colorbox.h" -#include <QtGui/QPainter> -#include <QtGui/QMouseEvent> +#include <QPainter> +#include <QMouseEvent> static inline QString properName(const QColor &color) { diff --git a/src/libs/qmleditorwidgets/colorbox.h b/src/libs/qmleditorwidgets/colorbox.h index 516c989204..417417ad41 100644 --- a/src/libs/qmleditorwidgets/colorbox.h +++ b/src/libs/qmleditorwidgets/colorbox.h @@ -34,8 +34,8 @@ #define COLORBOX_H #include <qmleditorwidgets_global.h> -#include <QtGui/QWidget> -#include <QtDeclarative/qdeclarative.h> +#include <QWidget> +#include <qdeclarative.h> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/colorbutton.cpp b/src/libs/qmleditorwidgets/colorbutton.cpp index 6ac2379a98..2aeebdfbea 100644 --- a/src/libs/qmleditorwidgets/colorbutton.cpp +++ b/src/libs/qmleditorwidgets/colorbutton.cpp @@ -31,7 +31,7 @@ **************************************************************************/ #include "colorbutton.h" -#include <QtGui/QPainter> +#include <QPainter> static inline QPixmap tilePixMap(int size) { diff --git a/src/libs/qmleditorwidgets/colorbutton.h b/src/libs/qmleditorwidgets/colorbutton.h index 356b88bdc8..0e0613d5f6 100644 --- a/src/libs/qmleditorwidgets/colorbutton.h +++ b/src/libs/qmleditorwidgets/colorbutton.h @@ -34,8 +34,8 @@ #define COLORBUTTON_H #include <qmleditorwidgets_global.h> -#include <QtGui/QToolButton> -#include <QtDeclarative/qdeclarative.h> +#include <QToolButton> +#include <qdeclarative.h> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp index 0f7b4d0c7b..1f50f440bb 100644 --- a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp @@ -35,8 +35,8 @@ #include "customcolordialog.h" #include "ui_contextpanetext.h" #include <qmljs/qmljspropertyreader.h> -#include <QtCore/QTimerEvent> -#include <QtCore/QVariant> +#include <QTimerEvent> +#include <QVariant> namespace QmlEditorWidgets { ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) : diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h index f0f13b1d0b..f140646c71 100644 --- a/src/libs/qmleditorwidgets/contextpanetextwidget.h +++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h @@ -34,7 +34,7 @@ #define CONTEXTPANETEXTWIDGET_H #include <qmleditorwidgets_global.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QVariant; diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index c0668651e7..1386ecb45a 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -31,19 +31,19 @@ **************************************************************************/ #include "contextpanewidget.h" -#include <QtGui/QToolButton> -#include <QtGui/QFontComboBox> -#include <QtGui/QComboBox> -#include <QtGui/QSpinBox> -#include <QtGui/QToolButton> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QMouseEvent> -#include <QtGui/QGridLayout> -#include <QtGui/QToolButton> -#include <QtGui/QGraphicsEffect> -#include <QtGui/QAction> +#include <QToolButton> +#include <QFontComboBox> +#include <QComboBox> +#include <QSpinBox> +#include <QToolButton> +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QLabel> +#include <QMouseEvent> +#include <QGridLayout> +#include <QToolButton> +#include <QGraphicsEffect> +#include <QAction> #include "contextpanetextwidget.h" #include "easingcontextpane.h" #include "contextpanewidgetimage.h" diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h index 45a5abea5f..d6aa3aca9e 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.h +++ b/src/libs/qmleditorwidgets/contextpanewidget.h @@ -34,8 +34,8 @@ #define CONTEXTPANEWIDGET_H #include <qmleditorwidgets_global.h> -#include <QtGui/QFrame> -#include <QtCore/QWeakPointer> +#include <QFrame> +#include <QWeakPointer> QT_BEGIN_NAMESPACE class QToolButton; diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index 38fea919cd..fd5f3256e9 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -34,17 +34,17 @@ #include "ui_contextpanewidgetimage.h" #include "ui_contextpanewidgetborderimage.h" #include <qmljs/qmljspropertyreader.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QPixmap> -#include <QtGui/QPainter> -#include <QtGui/QGraphicsEffect> -#include <QtGui/QMouseEvent> -#include <QtGui/QScrollArea> -#include <QtGui/QSlider> -#include <QtGui/QToolButton> -#include <QtCore/QDebug> +#include <QFile> +#include <QFileInfo> +#include <QDir> +#include <QPixmap> +#include <QPainter> +#include <QGraphicsEffect> +#include <QMouseEvent> +#include <QScrollArea> +#include <QSlider> +#include <QToolButton> +#include <QDebug> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h index 3b8b302dc5..1c45956b91 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h @@ -34,7 +34,7 @@ #define CONTEXTPANEWIDGETIMAGE_H #include <qmleditorwidgets_global.h> -#include <QtGui/QLabel> +#include <QLabel> #include <contextpanewidget.h> #include <qdrawutil.h> diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp index d0c0848140..c4e9138efa 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp @@ -36,7 +36,7 @@ #include <qmljs/qmljspropertyreader.h> #include <qmljs/qmljsutils.h> #include <customcolordialog.h> -#include <QtCore/QDebug> +#include <QDebug> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h index 5e896f5ed2..356369639a 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h @@ -34,7 +34,7 @@ #define CONTEXTPANEWIDGETRECTANGLE_H #include <qmleditorwidgets_global.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE namespace Ui { diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp index bf958662ae..59bd6744eb 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.cpp +++ b/src/libs/qmleditorwidgets/customcolordialog.cpp @@ -34,14 +34,14 @@ #include "huecontrol.h" #include "colorbox.h" -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QPainter> -#include <QtGui/QDoubleSpinBox> -#include <QtGui/QGridLayout> -#include <QtGui/QPushButton> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QGraphicsEffect> +#include <QHBoxLayout> +#include <QLabel> +#include <QPainter> +#include <QDoubleSpinBox> +#include <QGridLayout> +#include <QPushButton> +#include <QDialogButtonBox> +#include <QGraphicsEffect> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h index ef40f61a8d..6e1e38cfe8 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.h +++ b/src/libs/qmleditorwidgets/customcolordialog.h @@ -34,7 +34,7 @@ #define CUSTOMCOLORDIALOG_H #include <qmleditorwidgets_global.h> -#include <QtGui/QFrame> +#include <QFrame> QT_BEGIN_NAMESPACE class QDoubleSpinBox; diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp index bba5ba61f8..b7e0abae50 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp @@ -34,10 +34,10 @@ #include "ui_easingcontextpane.h" #include <qmljs/qmljspropertyreader.h> -#include <QtGui/QGraphicsPixmapItem> -#include <QtGui/QGraphicsScene> -#include <QtCore/QPropertyAnimation> -#include <QtCore/QSequentialAnimationGroup> +#include <QGraphicsPixmapItem> +#include <QGraphicsScene> +#include <QPropertyAnimation> +#include <QSequentialAnimationGroup> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h index 431a81c0be..4e18c85946 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h @@ -35,7 +35,7 @@ #include "easinggraph.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QVariant; diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp index 3714749159..2c715fd13e 100644 --- a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp +++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp @@ -32,8 +32,8 @@ #include "easinggraph.h" -#include <QtGui/QPainter> -#include <QtGui/QStyleOptionGraphicsItem> +#include <QPainter> +#include <QStyleOptionGraphicsItem> #include <math.h> QT_BEGIN_NAMESPACE diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h index 7d95204baf..0deeaf7e21 100644 --- a/src/libs/qmleditorwidgets/easingpane/easinggraph.h +++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.h @@ -33,9 +33,9 @@ #ifndef EASINGGRAPH_H #define EASINGGRAPH_H -#include <QtGui/QWidget> -#include <QtCore/QEasingCurve> -#include <QtCore/QHash> +#include <QWidget> +#include <QEasingCurve> +#include <QHash> QT_BEGIN_HEADER diff --git a/src/libs/qmleditorwidgets/filewidget.cpp b/src/libs/qmleditorwidgets/filewidget.cpp index 5a412b09d4..e0943a59ca 100644 --- a/src/libs/qmleditorwidgets/filewidget.cpp +++ b/src/libs/qmleditorwidgets/filewidget.cpp @@ -32,16 +32,16 @@ #include "filewidget.h" -#include <QtGui/QLabel> -#include <QtGui/QToolButton> -#include <QtGui/QLineEdit> -#include <QtGui/QComboBox> - -#include <QtGui/QHBoxLayout> -#include <QtGui/QFont> -#include <QtGui/QFileDialog> -#include <QtCore/QDirIterator> -#include <QtCore/QDebug> +#include <QLabel> +#include <QToolButton> +#include <QLineEdit> +#include <QComboBox> + +#include <QHBoxLayout> +#include <QFont> +#include <QFileDialog> +#include <QDirIterator> +#include <QDebug> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/filewidget.h b/src/libs/qmleditorwidgets/filewidget.h index b9c35777f5..255f912c29 100644 --- a/src/libs/qmleditorwidgets/filewidget.h +++ b/src/libs/qmleditorwidgets/filewidget.h @@ -36,9 +36,9 @@ #include <qmleditorwidgets_global.h> -#include <QtGui/QWidget> +#include <QWidget> -#include <QtCore/QUrl> +#include <QUrl> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.cpp b/src/libs/qmleditorwidgets/fontsizespinbox.cpp index 3dd264ada4..0ba1bf0459 100644 --- a/src/libs/qmleditorwidgets/fontsizespinbox.cpp +++ b/src/libs/qmleditorwidgets/fontsizespinbox.cpp @@ -32,8 +32,8 @@ #include "fontsizespinbox.h" -#include <QtGui/QLineEdit> -#include <QtGui/QRegExpValidator> +#include <QLineEdit> +#include <QRegExpValidator> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.h b/src/libs/qmleditorwidgets/fontsizespinbox.h index 50676bc2db..36b75b2243 100644 --- a/src/libs/qmleditorwidgets/fontsizespinbox.h +++ b/src/libs/qmleditorwidgets/fontsizespinbox.h @@ -34,7 +34,7 @@ #define FONTSIZESPINBOX_H #include <qmleditorwidgets_global.h> -#include <QtGui/QAbstractSpinBox> +#include <QAbstractSpinBox> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/gradientline.cpp b/src/libs/qmleditorwidgets/gradientline.cpp index 822334c95f..35cd9ea61b 100644 --- a/src/libs/qmleditorwidgets/gradientline.cpp +++ b/src/libs/qmleditorwidgets/gradientline.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "gradientline.h" -#include <QtGui/QPainter> -#include <QtGui/QMouseEvent> +#include <QPainter> +#include <QMouseEvent> static inline QPixmap tilePixMap(int size) { diff --git a/src/libs/qmleditorwidgets/gradientline.h b/src/libs/qmleditorwidgets/gradientline.h index e1dcbb7817..216f31554c 100644 --- a/src/libs/qmleditorwidgets/gradientline.h +++ b/src/libs/qmleditorwidgets/gradientline.h @@ -34,8 +34,8 @@ #define GRADIENTLINE_H #include <qmleditorwidgets_global.h> -#include <QtGui/QWidget> -#include <QtGui/QLinearGradient> +#include <QWidget> +#include <QLinearGradient> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/huecontrol.cpp b/src/libs/qmleditorwidgets/huecontrol.cpp index 00b4a2a068..2c2e7a71f7 100644 --- a/src/libs/qmleditorwidgets/huecontrol.cpp +++ b/src/libs/qmleditorwidgets/huecontrol.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "huecontrol.h" -#include <QtGui/QPainter> -#include <QtGui/QMouseEvent> +#include <QPainter> +#include <QMouseEvent> static inline int clamp(int x, int lower, int upper) { diff --git a/src/libs/qmleditorwidgets/huecontrol.h b/src/libs/qmleditorwidgets/huecontrol.h index 8df24bf68f..95cc67b357 100644 --- a/src/libs/qmleditorwidgets/huecontrol.h +++ b/src/libs/qmleditorwidgets/huecontrol.h @@ -34,8 +34,8 @@ #define HUECONTROL_H #include <qmleditorwidgets_global.h> -#include <QtGui/QWidget> -#include <QtDeclarative/qdeclarative.h> +#include <QWidget> +#include <qdeclarative.h> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets_global.h b/src/libs/qmleditorwidgets/qmleditorwidgets_global.h index e336f5a15c..d0922344b6 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets_global.h +++ b/src/libs/qmleditorwidgets/qmleditorwidgets_global.h @@ -33,7 +33,7 @@ #ifndef QMLEDITORWIDGETS_GLOBAL_H #define QMLEDITORWIDGETS_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> # if defined(BUILD_QMLEDITORWIDGETS_LIB) # define QMLEDITORWIDGETS_EXPORT Q_DECL_EXPORT diff --git a/src/libs/qmljs/jsoncheck.cpp b/src/libs/qmljs/jsoncheck.cpp index 935e8d8c7a..0073740da8 100644 --- a/src/libs/qmljs/jsoncheck.cpp +++ b/src/libs/qmljs/jsoncheck.cpp @@ -35,10 +35,10 @@ #include <qmljs/parser/qmljsast_p.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QLatin1String> -#include <QtCore/QRegExp> -#include <QtCore/QMap> +#include <QDebug> +#include <QLatin1String> +#include <QRegExp> +#include <QMap> #include <cmath> diff --git a/src/libs/qmljs/jsoncheck.h b/src/libs/qmljs/jsoncheck.h index ee688590c7..9695cc55e1 100644 --- a/src/libs/qmljs/jsoncheck.h +++ b/src/libs/qmljs/jsoncheck.h @@ -42,10 +42,10 @@ #include <utils/json.h> -#include <QtCore/QString> -#include <QtCore/QSet> -#include <QtCore/QStack> -#include <QtCore/QList> +#include <QString> +#include <QSet> +#include <QStack> +#include <QList> namespace QmlJS { diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp index 825bbb1300..25249899bf 100644 --- a/src/libs/qmljs/parser/qmldirparser.cpp +++ b/src/libs/qmljs/parser/qmldirparser.cpp @@ -34,9 +34,9 @@ #include "qmlerror.h" bool Qml_isFileCaseCorrect(const QString &) { return true; } -#include <QtCore/QTextStream> -#include <QtCore/QFile> -#include <QtCore/QtDebug> +#include <QTextStream> +#include <QFile> +#include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/parser/qmldirparser_p.h b/src/libs/qmljs/parser/qmldirparser_p.h index 2298e2e89a..21266aaf9e 100644 --- a/src/libs/qmljs/parser/qmldirparser_p.h +++ b/src/libs/qmljs/parser/qmldirparser_p.h @@ -44,8 +44,8 @@ // We mean it. // -#include <QtCore/QUrl> -#include <QtCore/QHash> +#include <QUrl> +#include <QHash> #include "qmljsglobal_p.h" diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp index c67f1f27d6..a126609412 100644 --- a/src/libs/qmljs/parser/qmlerror.cpp +++ b/src/libs/qmljs/parser/qmlerror.cpp @@ -32,9 +32,9 @@ #include "qmlerror.h" -#include <QtCore/qdebug.h> -#include <QtCore/qfile.h> -#include <QtCore/qstringlist.h> +#include <qdebug.h> +#include <qfile.h> +#include <qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/parser/qmlerror.h b/src/libs/qmljs/parser/qmlerror.h index 257f1fc82d..5839152f8b 100644 --- a/src/libs/qmljs/parser/qmlerror.h +++ b/src/libs/qmljs/parser/qmlerror.h @@ -33,8 +33,8 @@ #ifndef QMLERROR_H #define QMLERROR_H -#include <QtCore/qurl.h> -#include <QtCore/qstring.h> +#include <qurl.h> +#include <qstring.h> QT_BEGIN_HEADER diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h index 9f9e1e2859..75a54994f3 100644 --- a/src/libs/qmljs/parser/qmljsast_p.h +++ b/src/libs/qmljs/parser/qmljsast_p.h @@ -48,7 +48,7 @@ #include "qmljsglobal_p.h" #include "qmljsmemorypool_p.h" -#include <QtCore/QString> +#include <QString> QT_QML_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljsastfwd_p.h b/src/libs/qmljs/parser/qmljsastfwd_p.h index 9e2b9becd0..6854595762 100644 --- a/src/libs/qmljs/parser/qmljsastfwd_p.h +++ b/src/libs/qmljs/parser/qmljsastfwd_p.h @@ -35,7 +35,7 @@ #include "qmljsglobal_p.h" -#include <QtCore/qglobal.h> +#include <qglobal.h> // // W A R N I N G diff --git a/src/libs/qmljs/parser/qmljsglobal_p.h b/src/libs/qmljs/parser/qmljsglobal_p.h index 4432e45fc2..5d9c5b0191 100644 --- a/src/libs/qmljs/parser/qmljsglobal_p.h +++ b/src/libs/qmljs/parser/qmljsglobal_p.h @@ -32,7 +32,7 @@ #ifndef QMLJSGLOBAL_P_H #define QMLJSGLOBAL_P_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #ifdef QT_CREATOR # define QT_QML_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h index ab409cbd28..0c675e847b 100644 --- a/src/libs/qmljs/parser/qmljsgrammar_p.h +++ b/src/libs/qmljs/parser/qmljsgrammar_p.h @@ -46,7 +46,7 @@ #define QMLJSGRAMMAR_P_H #include "qmljsglobal_p.h" -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index 4eafefdae0..8b481bcb3f 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/src/libs/qmljs/parser/qmljslexer.cpp @@ -34,9 +34,9 @@ #include "qmljsengine_p.h" #include "qmljsmemorypool_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QVarLengthArray> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QVarLengthArray> +#include <QDebug> QT_BEGIN_NAMESPACE Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); diff --git a/src/libs/qmljs/parser/qmljslexer_p.h b/src/libs/qmljs/parser/qmljslexer_p.h index 68207bc665..27e7ac1208 100644 --- a/src/libs/qmljs/parser/qmljslexer_p.h +++ b/src/libs/qmljs/parser/qmljslexer_p.h @@ -46,7 +46,7 @@ #include "qmljsglobal_p.h" #include "qmljsgrammar_p.h" -#include <QtCore/QString> +#include <QString> QT_QML_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljsmemorypool_p.h b/src/libs/qmljs/parser/qmljsmemorypool_p.h index 27d502972d..2cb7d036c5 100644 --- a/src/libs/qmljs/parser/qmljsmemorypool_p.h +++ b/src/libs/qmljs/parser/qmljsmemorypool_p.h @@ -46,9 +46,9 @@ #include "qmljsglobal_p.h" -#include <QtCore/qglobal.h> -#include <QtCore/qshareddata.h> -#include <QtCore/qdebug.h> +#include <qglobal.h> +#include <qshareddata.h> +#include <qdebug.h> #include <cstring> diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp index 007b456cdd..b147a6eed8 100644 --- a/src/libs/qmljs/parser/qmljsparser.cpp +++ b/src/libs/qmljs/parser/qmljsparser.cpp @@ -30,8 +30,8 @@ ** **************************************************************************/ -#include <QtCore/QtDebug> -#include <QtCore/QCoreApplication> +#include <QtDebug> +#include <QCoreApplication> #include <string.h> diff --git a/src/libs/qmljs/parser/qmljsparser_p.h b/src/libs/qmljs/parser/qmljsparser_p.h index 7602ffc050..1e52432831 100644 --- a/src/libs/qmljs/parser/qmljsparser_p.h +++ b/src/libs/qmljs/parser/qmljsparser_p.h @@ -55,8 +55,8 @@ #include "qmljsast_p.h" #include "qmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> QT_QML_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/qmljs_global.h b/src/libs/qmljs/qmljs_global.h index 032001ebee..d427ecc17f 100644 --- a/src/libs/qmljs/qmljs_global.h +++ b/src/libs/qmljs/qmljs_global.h @@ -33,7 +33,7 @@ #ifndef QMLJS_GLOBAL_H #define QMLJS_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(QMLJS_BUILD_DIR) # define QMLJS_EXPORT Q_DECL_EXPORT diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp index bb665990ec..c5352102cf 100644 --- a/src/libs/qmljs/qmljsbind.cpp +++ b/src/libs/qmljs/qmljsbind.cpp @@ -37,9 +37,9 @@ #include <languageutils/componentversion.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QDir> +#include <QFileInfo> +#include <QDebug> using namespace LanguageUtils; using namespace QmlJS; diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h index c54bf76a97..75543976a9 100644 --- a/src/libs/qmljs/qmljsbind.h +++ b/src/libs/qmljs/qmljsbind.h @@ -37,10 +37,10 @@ #include <qmljs/qmljsinterpreter.h> #include <qmljs/qmljsvalueowner.h> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtCore/QCoreApplication> +#include <QHash> +#include <QStringList> +#include <QSharedPointer> +#include <QCoreApplication> namespace QmlJS { diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 76b5208364..007bc0d4a3 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -39,10 +39,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtGui/QColor> -#include <QtGui/QApplication> +#include <QDebug> +#include <QDir> +#include <QColor> +#include <QApplication> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h index ba5f61a898..ff178f4f7c 100644 --- a/src/libs/qmljs/qmljscheck.h +++ b/src/libs/qmljs/qmljscheck.h @@ -40,10 +40,10 @@ #include <qmljs/qmljsstaticanalysismessage.h> #include <qmljs/parser/qmljsastvisitor_p.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QSet> -#include <QtCore/QStack> -#include <QtGui/QColor> +#include <QCoreApplication> +#include <QSet> +#include <QStack> +#include <QColor> namespace QmlJS { diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index 95fb92f4f5..77bd008de6 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -32,11 +32,11 @@ #include "qmljscodeformatter.h" -#include <QtCore/QDebug> -#include <QtCore/QMetaEnum> -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QMetaEnum> +#include <QTextDocument> +#include <QTextCursor> +#include <QTextBlock> using namespace QmlJS; diff --git a/src/libs/qmljs/qmljscodeformatter.h b/src/libs/qmljs/qmljscodeformatter.h index 5cb8fb0d71..10dfacea0e 100644 --- a/src/libs/qmljs/qmljscodeformatter.h +++ b/src/libs/qmljs/qmljscodeformatter.h @@ -37,9 +37,9 @@ #include "qmljsscanner.h" -#include <QtCore/QStack> -#include <QtCore/QList> -#include <QtCore/QVector> +#include <QStack> +#include <QList> +#include <QVector> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/libs/qmljs/qmljscompletioncontextfinder.cpp b/src/libs/qmljs/qmljscompletioncontextfinder.cpp index f6637b6f13..073e298eaa 100644 --- a/src/libs/qmljs/qmljscompletioncontextfinder.cpp +++ b/src/libs/qmljs/qmljscompletioncontextfinder.cpp @@ -32,8 +32,8 @@ #include "qmljscompletioncontextfinder.h" -#include <QtCore/QDebug> -#include <QtGui/QTextDocument> +#include <QDebug> +#include <QTextDocument> using namespace QmlJS; diff --git a/src/libs/qmljs/qmljscompletioncontextfinder.h b/src/libs/qmljs/qmljscompletioncontextfinder.h index c94ff49727..8e71d64d0c 100644 --- a/src/libs/qmljs/qmljscompletioncontextfinder.h +++ b/src/libs/qmljs/qmljscompletioncontextfinder.h @@ -36,8 +36,8 @@ #include "qmljs_global.h" #include <qmljs/qmljslineinfo.h> -#include <QtCore/QStringList> -#include <QtGui/QTextCursor> +#include <QStringList> +#include <QTextCursor> namespace QmlJS { diff --git a/src/libs/qmljs/qmljscontext.h b/src/libs/qmljs/qmljscontext.h index bf6d269725..982801b008 100644 --- a/src/libs/qmljs/qmljscontext.h +++ b/src/libs/qmljs/qmljscontext.h @@ -36,7 +36,7 @@ #include "qmljs_global.h" #include "qmljsvalueowner.h" -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace QmlJS { diff --git a/src/libs/qmljs/qmljsdelta.cpp b/src/libs/qmljs/qmljsdelta.cpp index 4af8d4d3cb..8fe250b72e 100644 --- a/src/libs/qmljs/qmljsdelta.cpp +++ b/src/libs/qmljs/qmljsdelta.cpp @@ -37,8 +37,8 @@ #include <typeinfo> -#include <QtCore/QDebug> -#include <QtCore/QStringList> +#include <QDebug> +#include <QStringList> using namespace QmlJS::AST; diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp index 9e0d4804e8..0f457faafe 100644 --- a/src/libs/qmljs/qmljsdocument.cpp +++ b/src/libs/qmljs/qmljsdocument.cpp @@ -36,7 +36,7 @@ #include <qmljs/parser/qmljslexer_p.h> #include <qmljs/parser/qmljsparser_p.h> #include <qmljs/parser/qmljsastfwd_p.h> -#include <QtCore/QDir> +#include <QDir> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h index 98d01e0585..8bb3b702ea 100644 --- a/src/libs/qmljs/qmljsdocument.h +++ b/src/libs/qmljs/qmljsdocument.h @@ -32,10 +32,10 @@ #ifndef QMLDOCUMENT_H #define QMLDOCUMENT_H -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QList> +#include <QPair> +#include <QSharedPointer> +#include <QString> #include <languageutils/fakemetaobject.h> diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp index 7c7afff97a..b0d30f9efc 100644 --- a/src/libs/qmljs/qmljsevaluate.cpp +++ b/src/libs/qmljs/qmljsevaluate.cpp @@ -35,7 +35,7 @@ #include "qmljsvalueowner.h" #include "qmljsscopechain.h" #include "parser/qmljsast_p.h" -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; diff --git a/src/libs/qmljs/qmljsicons.cpp b/src/libs/qmljs/qmljsicons.cpp index 1c3ddd7027..aae1f3fcb2 100644 --- a/src/libs/qmljs/qmljsicons.cpp +++ b/src/libs/qmljs/qmljsicons.cpp @@ -31,10 +31,10 @@ **************************************************************************/ #include "qmljsicons.h" -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QHash> -#include <QtCore/QPair> +#include <QDebug> +#include <QDir> +#include <QHash> +#include <QPair> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/libs/qmljs/qmljsicons.h b/src/libs/qmljs/qmljsicons.h index 9bd9f6de24..1b5a49b710 100644 --- a/src/libs/qmljs/qmljsicons.h +++ b/src/libs/qmljs/qmljsicons.h @@ -35,7 +35,7 @@ #include <qmljs/qmljs_global.h> #include <qmljs/parser/qmljsast_p.h> -#include <QtGui/QIcon> +#include <QIcon> namespace QmlJS { diff --git a/src/libs/qmljs/qmljsicontextpane.h b/src/libs/qmljs/qmljsicontextpane.h index 4b881feae5..c92c4626f3 100644 --- a/src/libs/qmljs/qmljsicontextpane.h +++ b/src/libs/qmljs/qmljsicontextpane.h @@ -33,7 +33,7 @@ #ifndef QMLJSICONTEXTPANE_H #define QMLJSICONTEXTPANE_H -#include <QtCore/QObject> +#include <QObject> #include "qmljs_global.h" diff --git a/src/libs/qmljs/qmljsindenter.cpp b/src/libs/qmljs/qmljsindenter.cpp index fb00ff0418..6b3f7d067d 100644 --- a/src/libs/qmljs/qmljsindenter.cpp +++ b/src/libs/qmljs/qmljsindenter.cpp @@ -71,8 +71,8 @@ #include <qmljs/qmljsindenter.h> #include <qmljs/qmljsscanner.h> -#include <QtCore/QtDebug> -#include <QtGui/QTextBlock> +#include <QtDebug> +#include <QTextBlock> using namespace QmlJS; diff --git a/src/libs/qmljs/qmljsindenter.h b/src/libs/qmljs/qmljsindenter.h index d7b45db2c7..ab93678914 100644 --- a/src/libs/qmljs/qmljsindenter.h +++ b/src/libs/qmljs/qmljsindenter.h @@ -36,7 +36,7 @@ #include <qmljs/qmljs_global.h> #include <qmljs/qmljslineinfo.h> -#include <QtCore/QRegExp> +#include <QRegExp> QT_FORWARD_DECLARE_CLASS(QTextBlock) diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index a01893f549..b9fdb64e85 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -45,15 +45,15 @@ #include <languageutils/fakemetaobject.h> #include <utils/qtcassert.h> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QMetaObject> -#include <QtCore/QMetaProperty> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QProcess> -#include <QtCore/QDebug> +#include <QFile> +#include <QDir> +#include <QString> +#include <QStringList> +#include <QMetaObject> +#include <QMetaProperty> +#include <QXmlStreamReader> +#include <QProcess> +#include <QDebug> #include <algorithm> diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 52ebb32231..efe7f1fad9 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -39,12 +39,12 @@ #include <qmljs/qmljs_global.h> #include <qmljs/parser/qmljsastfwd_p.h> -#include <QtCore/QFileInfoList> -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QMutex> +#include <QFileInfoList> +#include <QList> +#include <QString> +#include <QHash> +#include <QSet> +#include <QMutex> namespace QmlJS { diff --git a/src/libs/qmljs/qmljslineinfo.h b/src/libs/qmljs/qmljslineinfo.h index 43f2873cf5..34555e0378 100644 --- a/src/libs/qmljs/qmljslineinfo.h +++ b/src/libs/qmljs/qmljslineinfo.h @@ -36,8 +36,8 @@ #include <qmljs/qmljs_global.h> #include <qmljs/qmljsscanner.h> -#include <QtCore/QRegExp> -#include <QtGui/QTextBlock> +#include <QRegExp> +#include <QTextBlock> namespace QmlJS { diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index 031c0434c0..c791a7c732 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -38,9 +38,9 @@ #include "qmljsutils.h" #include "qmljsmodelmanagerinterface.h" -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QFileInfo> +#include <QDir> +#include <QDebug> using namespace LanguageUtils; using namespace QmlJS; diff --git a/src/libs/qmljs/qmljslink.h b/src/libs/qmljs/qmljslink.h index 9a2138cbf9..ab6106af6b 100644 --- a/src/libs/qmljs/qmljslink.h +++ b/src/libs/qmljs/qmljslink.h @@ -38,7 +38,7 @@ #include <qmljs/parser/qmljsastfwd_p.h> #include <languageutils/componentversion.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace QmlJS { diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h index b6eeaf9db1..b3d7069faf 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.h +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h @@ -38,9 +38,9 @@ #include <utils/environment.h> -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QPointer> +#include <QObject> +#include <QStringList> +#include <QPointer> namespace ProjectExplorer { class Project; diff --git a/src/libs/qmljs/qmljspropertyreader.cpp b/src/libs/qmljs/qmljspropertyreader.cpp index 8dde9bf32b..81b71059d0 100644 --- a/src/libs/qmljs/qmljspropertyreader.cpp +++ b/src/libs/qmljs/qmljspropertyreader.cpp @@ -35,7 +35,7 @@ #include <qmljs/parser/qmljsast_p.h> #include <qmljs/qmljsutils.h> -#include <QtGui/QLinearGradient> +#include <QLinearGradient> namespace QmlJS { diff --git a/src/libs/qmljs/qmljspropertyreader.h b/src/libs/qmljs/qmljspropertyreader.h index 5e4b38dd81..7816ac1cdb 100644 --- a/src/libs/qmljs/qmljspropertyreader.h +++ b/src/libs/qmljs/qmljspropertyreader.h @@ -37,9 +37,9 @@ #include <qmljs/parser/qmljsastfwd_p.h> #include <qmljs/qmljsdocument.h> -#include <QtCore/QHash> -#include <QtCore/QVariant> -#include <QtCore/QStringList> +#include <QHash> +#include <QVariant> +#include <QStringList> QT_FORWARD_DECLARE_CLASS(QLinearGradient) diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp index ce65412a7b..4040fd3555 100644 --- a/src/libs/qmljs/qmljsreformatter.cpp +++ b/src/libs/qmljs/qmljsreformatter.cpp @@ -37,13 +37,13 @@ #include "parser/qmljsast_p.h" #include "parser/qmljsastvisitor_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QString> -#include <QtCore/QFile> -#include <QtCore/QTextStream> -#include <QtGui/QTextBlock> -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> +#include <QCoreApplication> +#include <QString> +#include <QFile> +#include <QTextStream> +#include <QTextBlock> +#include <QTextDocument> +#include <QTextCursor> #include <limits> diff --git a/src/libs/qmljs/qmljsrewriter.cpp b/src/libs/qmljs/qmljsrewriter.cpp index 49c9a372f5..651a04b25a 100644 --- a/src/libs/qmljs/qmljsrewriter.cpp +++ b/src/libs/qmljs/qmljsrewriter.cpp @@ -38,9 +38,9 @@ #include <utils/changeset.h> // ### FIXME: remove these includes: -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> +#include <QTextBlock> +#include <QTextCursor> +#include <QTextDocument> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/libs/qmljs/qmljsrewriter.h b/src/libs/qmljs/qmljsrewriter.h index 74b564b65d..9ed0c70652 100644 --- a/src/libs/qmljs/qmljsrewriter.h +++ b/src/libs/qmljs/qmljsrewriter.h @@ -37,7 +37,7 @@ #include <qmljs/parser/qmljsastfwd_p.h> #include <utils/changeset.h> -#include <QtCore/QStringList> +#include <QStringList> namespace QmlJS { diff --git a/src/libs/qmljs/qmljsscanner.cpp b/src/libs/qmljs/qmljsscanner.cpp index af2192142b..ed7a5df985 100644 --- a/src/libs/qmljs/qmljsscanner.cpp +++ b/src/libs/qmljs/qmljsscanner.cpp @@ -32,7 +32,7 @@ #include <qmljs/qmljsscanner.h> -#include <QtGui/QTextCharFormat> +#include <QTextCharFormat> using namespace QmlJS; diff --git a/src/libs/qmljs/qmljsscanner.h b/src/libs/qmljs/qmljsscanner.h index dce10747d4..47dfc035b0 100644 --- a/src/libs/qmljs/qmljsscanner.h +++ b/src/libs/qmljs/qmljsscanner.h @@ -35,7 +35,7 @@ #include <qmljs/qmljs_global.h> -#include <QtCore/QStringList> +#include <QStringList> namespace QmlJS { diff --git a/src/libs/qmljs/qmljsscopebuilder.h b/src/libs/qmljs/qmljsscopebuilder.h index 28f8b6f36b..012e8b3e22 100644 --- a/src/libs/qmljs/qmljsscopebuilder.h +++ b/src/libs/qmljs/qmljsscopebuilder.h @@ -35,8 +35,8 @@ #include <qmljs/qmljsdocument.h> -#include <QtCore/QList> -#include <QtCore/QStack> +#include <QList> +#include <QStack> namespace QmlJS { diff --git a/src/libs/qmljs/qmljsscopechain.h b/src/libs/qmljs/qmljsscopechain.h index 730d8699c6..8d326b669f 100644 --- a/src/libs/qmljs/qmljsscopechain.h +++ b/src/libs/qmljs/qmljsscopechain.h @@ -37,8 +37,8 @@ #include "qmljsdocument.h" #include "qmljscontext.h" -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QList> +#include <QSharedPointer> namespace QmlJS { diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp index 7c3abc30ed..0d8cd54a40 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp +++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp @@ -34,7 +34,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace QmlJS; using namespace QmlJS::StaticAnalysis; diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.h b/src/libs/qmljs/qmljsstaticanalysismessage.h index bb0f172698..44f062e1dc 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.h +++ b/src/libs/qmljs/qmljsstaticanalysismessage.h @@ -36,9 +36,9 @@ #include "qmljs_global.h" #include "parser/qmljsengine_p.h" -#include <QtCore/QRegExp> -#include <QtCore/QString> -#include <QtCore/QList> +#include <QRegExp> +#include <QString> +#include <QList> namespace QmlJS { namespace StaticAnalysis { diff --git a/src/libs/qmljs/qmljstypedescriptionreader.cpp b/src/libs/qmljs/qmljstypedescriptionreader.cpp index 9d35f98dc5..a59584d334 100644 --- a/src/libs/qmljs/qmljstypedescriptionreader.cpp +++ b/src/libs/qmljs/qmljstypedescriptionreader.cpp @@ -42,8 +42,8 @@ #include "qmljsinterpreter.h" #include "qmljsutils.h" -#include <QtCore/QIODevice> -#include <QtCore/QBuffer> +#include <QIODevice> +#include <QBuffer> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/libs/qmljs/qmljstypedescriptionreader.h b/src/libs/qmljs/qmljstypedescriptionreader.h index 8553d2136c..afa928be42 100644 --- a/src/libs/qmljs/qmljstypedescriptionreader.h +++ b/src/libs/qmljs/qmljstypedescriptionreader.h @@ -38,7 +38,7 @@ #include "qmljsdocument.h" // for Q_DECLARE_TR_FUNCTIONS -#include <QtCore/QCoreApplication> +#include <QCoreApplication> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/libs/qmljs/qmljsutils.h b/src/libs/qmljs/qmljsutils.h index 436f152bae..4746a27f64 100644 --- a/src/libs/qmljs/qmljsutils.h +++ b/src/libs/qmljs/qmljsutils.h @@ -5,7 +5,7 @@ #include "parser/qmljsastfwd_p.h" #include "parser/qmljsengine_p.h" -#include <QtGui/QColor> +#include <QColor> namespace QmlJS { diff --git a/src/libs/qmljs/qmljsvalueowner.h b/src/libs/qmljs/qmljsvalueowner.h index e4734abe0e..94688717d0 100644 --- a/src/libs/qmljs/qmljsvalueowner.h +++ b/src/libs/qmljs/qmljsvalueowner.h @@ -36,7 +36,7 @@ #include "qmljs_global.h" #include "qmljsinterpreter.h" -#include <QtCore/QList> +#include <QList> namespace QmlJS { diff --git a/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp b/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp index 07a65eb787..a52d23b218 100644 --- a/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp +++ b/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp @@ -33,9 +33,9 @@ #include "qpacketprotocol.h" -#include <QtCore/qdebug.h> -#include <QtCore/qstringlist.h> -#include <QtNetwork/qnetworkproxy.h> +#include <qdebug.h> +#include <qstringlist.h> +#include <qnetworkproxy.h> #include <symbiandevicemanager.h> namespace QmlJsDebugClient { diff --git a/src/libs/qmljsdebugclient/qdeclarativedebugclient.h b/src/libs/qmljsdebugclient/qdeclarativedebugclient.h index 695d3861a4..a56369fa2e 100644 --- a/src/libs/qmljsdebugclient/qdeclarativedebugclient.h +++ b/src/libs/qmljsdebugclient/qdeclarativedebugclient.h @@ -33,7 +33,7 @@ #define QDECLARATIVEDEBUGCLIENT_H #include "qmljsdebugclient_global.h" -#include <QtNetwork/qtcpsocket.h> +#include <qtcpsocket.h> namespace QmlJsDebugClient { diff --git a/src/libs/qmljsdebugclient/qdeclarativeenginedebug.h b/src/libs/qmljsdebugclient/qdeclarativeenginedebug.h index 138f7f4623..01d5ce1b7c 100644 --- a/src/libs/qmljsdebugclient/qdeclarativeenginedebug.h +++ b/src/libs/qmljsdebugclient/qdeclarativeenginedebug.h @@ -34,9 +34,9 @@ #include "qmljsdebugclient_global.h" #include "qdeclarativedebugclient.h" -#include <QtCore/qobject.h> -#include <QtCore/qurl.h> -#include <QtCore/qvariant.h> +#include <qobject.h> +#include <qurl.h> +#include <qvariant.h> namespace QmlJsDebugClient { diff --git a/src/libs/qmljsdebugclient/qdeclarativeoutputparser.h b/src/libs/qmljsdebugclient/qdeclarativeoutputparser.h index 0a3a705971..2621d114d5 100644 --- a/src/libs/qmljsdebugclient/qdeclarativeoutputparser.h +++ b/src/libs/qmljsdebugclient/qdeclarativeoutputparser.h @@ -34,7 +34,7 @@ #include "qmljsdebugclient_global.h" -#include <QtCore/QObject> +#include <QObject> namespace QmlJsDebugClient { diff --git a/src/libs/qmljsdebugclient/qmlprofilereventlist.cpp b/src/libs/qmljsdebugclient/qmlprofilereventlist.cpp index 522db4de44..a024980b1a 100644 --- a/src/libs/qmljsdebugclient/qmlprofilereventlist.cpp +++ b/src/libs/qmljsdebugclient/qmlprofilereventlist.cpp @@ -32,17 +32,17 @@ #include "qmlprofilereventlist.h" -#include <QtCore/QUrl> -#include <QtCore/QHash> -#include <QtCore/QtAlgorithms> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QUrl> +#include <QHash> +#include <QtAlgorithms> +#include <QString> +#include <QStringList> -#include <QtCore/QFile> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> +#include <QFile> +#include <QXmlStreamReader> +#include <QXmlStreamWriter> -#include <QtCore/QTimer> +#include <QTimer> #include <utils/qtcassert.h> #include <QDebug> diff --git a/src/libs/qmljsdebugclient/qmlprofilereventlist.h b/src/libs/qmljsdebugclient/qmlprofilereventlist.h index b5b9660354..ab44900870 100644 --- a/src/libs/qmljsdebugclient/qmlprofilereventlist.h +++ b/src/libs/qmljsdebugclient/qmlprofilereventlist.h @@ -37,8 +37,8 @@ #include "qmlprofilereventlocation.h" #include "qmljsdebugclient_global.h" -#include <QtCore/QHash> -#include <QtCore/QObject> +#include <QHash> +#include <QObject> namespace QmlJsDebugClient { diff --git a/src/libs/qmljsdebugclient/qmlprofilereventtypes.h b/src/libs/qmljsdebugclient/qmlprofilereventtypes.h index 3aac731291..ae1c490002 100644 --- a/src/libs/qmljsdebugclient/qmlprofilereventtypes.h +++ b/src/libs/qmljsdebugclient/qmlprofilereventtypes.h @@ -33,7 +33,7 @@ #ifndef QMLPROFILEREVENTTYPES_H #define QMLPROFILEREVENTTYPES_H -#include <QtCore/QString> +#include <QString> namespace QmlJsDebugClient { diff --git a/src/libs/qmljsdebugclient/qmlprofilertraceclient.h b/src/libs/qmljsdebugclient/qmlprofilertraceclient.h index d68e1d1614..37309ce715 100644 --- a/src/libs/qmljsdebugclient/qmlprofilertraceclient.h +++ b/src/libs/qmljsdebugclient/qmlprofilertraceclient.h @@ -38,8 +38,8 @@ #include "qmlprofilereventlocation.h" #include "qmljsdebugclient_global.h" -#include <QtCore/QStack> -#include <QtCore/QStringList> +#include <QStack> +#include <QStringList> namespace QmlJsDebugClient { diff --git a/src/libs/qmljsdebugclient/qpacketprotocol.cpp b/src/libs/qmljsdebugclient/qpacketprotocol.cpp index 55aeca8e55..f7198fa5d7 100644 --- a/src/libs/qmljsdebugclient/qpacketprotocol.cpp +++ b/src/libs/qmljsdebugclient/qpacketprotocol.cpp @@ -31,8 +31,8 @@ #include "qpacketprotocol.h" -#include <QtCore/qbuffer.h> -#include <QtCore/qelapsedtimer.h> +#include <qbuffer.h> +#include <qelapsedtimer.h> namespace QmlJsDebugClient { diff --git a/src/libs/qmljsdebugclient/qpacketprotocol.h b/src/libs/qmljsdebugclient/qpacketprotocol.h index 6980e803da..4225efccdb 100644 --- a/src/libs/qmljsdebugclient/qpacketprotocol.h +++ b/src/libs/qmljsdebugclient/qpacketprotocol.h @@ -32,8 +32,8 @@ #ifndef QPACKETPROTOCOL_H #define QPACKETPROTOCOL_H -#include <QtCore/qobject.h> -#include <QtCore/qdatastream.h> +#include <qobject.h> +#include <qdatastream.h> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/libs/qmljsdebugclient/qv8profilerclient.h b/src/libs/qmljsdebugclient/qv8profilerclient.h index 97f2792bfe..25e1328c73 100644 --- a/src/libs/qmljsdebugclient/qv8profilerclient.h +++ b/src/libs/qmljsdebugclient/qv8profilerclient.h @@ -37,8 +37,8 @@ #include "qmlprofilereventtypes.h" #include "qmljsdebugclient_global.h" -#include <QtCore/QStack> -#include <QtCore/QStringList> +#include <QStack> +#include <QStringList> namespace QmlJsDebugClient { diff --git a/src/libs/qtcomponents/styleitem/qrangemodel.h b/src/libs/qtcomponents/styleitem/qrangemodel.h index 44bced4e8a..5818100291 100644 --- a/src/libs/qtcomponents/styleitem/qrangemodel.h +++ b/src/libs/qtcomponents/styleitem/qrangemodel.h @@ -33,10 +33,10 @@ #ifndef QRANGEMODEL_H #define QRANGEMODEL_H -#include <QtCore/qobject.h> -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qabstractslider.h> -#include <QtDeclarative/qdeclarative.h> +#include <qobject.h> +#include <qgraphicsitem.h> +#include <qabstractslider.h> +#include <qdeclarative.h> class QRangeModelPrivate; diff --git a/src/libs/qtcomponents/styleitem/qstyleitem.cpp b/src/libs/qtcomponents/styleitem/qstyleitem.cpp index dc580d5b9b..7ca88425c0 100644 --- a/src/libs/qtcomponents/styleitem/qstyleitem.cpp +++ b/src/libs/qtcomponents/styleitem/qstyleitem.cpp @@ -39,15 +39,15 @@ #include "qstyleitem.h" -#include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QGroupBox> -#include <QtGui/QToolBar> -#include <QtGui/QMenu> -#include <QtCore/QStringBuilder> +#include <QPainter> +#include <QStyle> +#include <QStyleOption> +#include <QApplication> +#include <QMainWindow> +#include <QGroupBox> +#include <QToolBar> +#include <QMenu> +#include <QStringBuilder> QStyleItem::QStyleItem(QDeclarativeItem *parent) diff --git a/src/libs/qtcomponents/styleitem/qstyleplugin.h b/src/libs/qtcomponents/styleitem/qstyleplugin.h index 648add70c8..74cf097a2e 100644 --- a/src/libs/qtcomponents/styleitem/qstyleplugin.h +++ b/src/libs/qtcomponents/styleitem/qstyleplugin.h @@ -41,8 +41,8 @@ #define STYLEPLUGIN_H #include <QDeclarativeExtensionPlugin> -#include <QtScript/QScriptValue> -#include <QtCore/QTimer> +#include <QScriptValue> +#include <QTimer> #include <QFileSystemModel> #include "qdeclarativefolderlistmodel.h" diff --git a/src/libs/qtcomponents/styleitem/qtmenu.h b/src/libs/qtcomponents/styleitem/qtmenu.h index 7305a1cf9b..a32d779991 100644 --- a/src/libs/qtcomponents/styleitem/qtmenu.h +++ b/src/libs/qtcomponents/styleitem/qtmenu.h @@ -33,9 +33,9 @@ #ifndef QTMLMENU_H #define QTMLMENU_H -#include <QtGui/qmenu.h> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/QDeclarativeListProperty> +#include <qmenu.h> +#include <qdeclarative.h> +#include <QDeclarativeListProperty> #include "qtmenuitem.h" class QtMenu : public QObject { diff --git a/src/libs/qtcomponents/styleitem/qtmenubar.cpp b/src/libs/qtcomponents/styleitem/qtmenubar.cpp index 213833b1d5..a4d29486f1 100644 --- a/src/libs/qtcomponents/styleitem/qtmenubar.cpp +++ b/src/libs/qtcomponents/styleitem/qtmenubar.cpp @@ -39,7 +39,7 @@ #include "qtmenubar.h" -#include <QtGui/QMenu> +#include <QMenu> QtMenuBar::QtMenuBar(QDeclarativeItem *parent) : QDeclarativeItem(parent) diff --git a/src/libs/qtcomponents/styleitem/qtmenuitem.h b/src/libs/qtcomponents/styleitem/qtmenuitem.h index 5bf79b34ff..20eedbc51e 100644 --- a/src/libs/qtcomponents/styleitem/qtmenuitem.h +++ b/src/libs/qtcomponents/styleitem/qtmenuitem.h @@ -40,7 +40,7 @@ #ifndef QTMENUITEM_H #define QTMENUITEM_H -#include <QtCore/QObject> +#include <QObject> class QtMenuItem: public QObject { diff --git a/src/libs/qtcomponents/styleitem/qwheelarea.h b/src/libs/qtcomponents/styleitem/qwheelarea.h index bf09e32ee0..802b0e80f4 100644 --- a/src/libs/qtcomponents/styleitem/qwheelarea.h +++ b/src/libs/qtcomponents/styleitem/qwheelarea.h @@ -34,12 +34,12 @@ #define QWHEELAREA_H -#include <QtCore/qobject.h> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qdeclarativeitem.h> -#include <QtCore/qcoreevent.h> -#include <QtGui/qevent.h> -#include <QtGui/qgraphicssceneevent.h> +#include <qobject.h> +#include <qdeclarative.h> +#include <qdeclarativeitem.h> +#include <qcoreevent.h> +#include <qevent.h> +#include <qgraphicssceneevent.h> class QWheelArea : public QDeclarativeItem { diff --git a/src/libs/utils/annotateditemdelegate.cpp b/src/libs/utils/annotateditemdelegate.cpp index 69d022f66a..326bac9607 100644 --- a/src/libs/utils/annotateditemdelegate.cpp +++ b/src/libs/utils/annotateditemdelegate.cpp @@ -32,13 +32,13 @@ #include "annotateditemdelegate.h" -#include <QtCore/QSize> -#include <QtCore/QModelIndex> -#include <QtGui/QStandardItemModel> -#include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QStyleOptionViewItemV4> -#include <QtGui/QApplication> +#include <QSize> +#include <QModelIndex> +#include <QStandardItemModel> +#include <QPainter> +#include <QStyle> +#include <QStyleOptionViewItemV4> +#include <QApplication> using namespace Utils; diff --git a/src/libs/utils/annotateditemdelegate.h b/src/libs/utils/annotateditemdelegate.h index ef5cefbfc3..33f565b8a0 100644 --- a/src/libs/utils/annotateditemdelegate.h +++ b/src/libs/utils/annotateditemdelegate.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtCore/QString> -#include <QtGui/QStyledItemDelegate> +#include <QString> +#include <QStyledItemDelegate> namespace Utils { diff --git a/src/libs/utils/basevalidatinglineedit.cpp b/src/libs/utils/basevalidatinglineedit.cpp index 1071c60465..375f4a7a32 100644 --- a/src/libs/utils/basevalidatinglineedit.cpp +++ b/src/libs/utils/basevalidatinglineedit.cpp @@ -32,7 +32,7 @@ #include "basevalidatinglineedit.h" -#include <QtCore/QDebug> +#include <QDebug> enum { debug = 0 }; diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h index b0edee4da7..1d9b591ff9 100644 --- a/src/libs/utils/basevalidatinglineedit.h +++ b/src/libs/utils/basevalidatinglineedit.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QLineEdit> +#include <QLineEdit> namespace Utils { diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index d4b71afefb..7288eb36c0 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -32,19 +32,19 @@ #include "buildablehelperlibrary.h" -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QHash> -#include <QtCore/QProcess> -#include <QtCore/QDir> -#include <QtCore/QDateTime> +#include <QFileInfo> +#include <QCoreApplication> +#include <QHash> +#include <QProcess> +#include <QDir> +#include <QDateTime> #include <utils/environment.h> #include <utils/synchronousprocess.h> #include <utils/fileutils.h> -#include <QtGui/QDesktopServices> -#include <QtCore/QDebug> +#include <QDesktopServices> +#include <QDebug> namespace Utils { diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h index bd9cd7dad3..6b4c185252 100644 --- a/src/libs/utils/buildablehelperlibrary.h +++ b/src/libs/utils/buildablehelperlibrary.h @@ -37,7 +37,7 @@ #include <utils/environment.h> #include <utils/fileutils.h> -#include <QtCore/QString> +#include <QString> QT_FORWARD_DECLARE_CLASS(QFileInfo) diff --git a/src/libs/utils/changeset.cpp b/src/libs/utils/changeset.cpp index 904635828a..b3d62263dd 100644 --- a/src/libs/utils/changeset.cpp +++ b/src/libs/utils/changeset.cpp @@ -32,7 +32,7 @@ #include "changeset.h" -#include <QtGui/QTextCursor> +#include <QTextCursor> namespace Utils { diff --git a/src/libs/utils/changeset.h b/src/libs/utils/changeset.h index a00c9b6a2a..ab80832d8b 100644 --- a/src/libs/utils/changeset.h +++ b/src/libs/utils/changeset.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtCore/QString> -#include <QtCore/QList> +#include <QString> +#include <QList> QT_FORWARD_DECLARE_CLASS(QTextCursor) diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp index 99e80093ab..4966f9afdd 100644 --- a/src/libs/utils/checkablemessagebox.cpp +++ b/src/libs/utils/checkablemessagebox.cpp @@ -32,21 +32,21 @@ #include "checkablemessagebox.h" -#include <QtCore/QDebug> -#include <QtCore/QVariant> - -#include <QtGui/QPushButton> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QButtonGroup> -#include <QtGui/QCheckBox> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> -#include <QtGui/QLabel> -#include <QtGui/QSpacerItem> -#include <QtGui/QVBoxLayout> +#include <QDebug> +#include <QVariant> + +#include <QPushButton> +#include <QAction> +#include <QApplication> +#include <QButtonGroup> +#include <QCheckBox> +#include <QDialog> +#include <QDialogButtonBox> +#include <QHBoxLayout> +#include <QHeaderView> +#include <QLabel> +#include <QSpacerItem> +#include <QVBoxLayout> /*! diff --git a/src/libs/utils/checkablemessagebox.h b/src/libs/utils/checkablemessagebox.h index 50c6af6438..141e279f7f 100644 --- a/src/libs/utils/checkablemessagebox.h +++ b/src/libs/utils/checkablemessagebox.h @@ -35,9 +35,9 @@ #include "utils_global.h" -#include <QtGui/QDialogButtonBox> -#include <QtGui/QMessageBox> -#include <QtGui/QDialog> +#include <QDialogButtonBox> +#include <QMessageBox> +#include <QDialog> namespace Utils { diff --git a/src/libs/utils/classnamevalidatinglineedit.cpp b/src/libs/utils/classnamevalidatinglineedit.cpp index 65b389a4c8..dedc0d08e6 100644 --- a/src/libs/utils/classnamevalidatinglineedit.cpp +++ b/src/libs/utils/classnamevalidatinglineedit.cpp @@ -34,8 +34,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QDebug> +#include <QRegExp> /*! \class Utils::ClassNameValidatingLineEdit diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp index bd957993e2..fd5a4f3864 100644 --- a/src/libs/utils/codegeneration.cpp +++ b/src/libs/utils/codegeneration.cpp @@ -32,9 +32,9 @@ #include "codegeneration.h" -#include <QtCore/QTextStream> -#include <QtCore/QStringList> -#include <QtCore/QFileInfo> +#include <QTextStream> +#include <QStringList> +#include <QFileInfo> namespace Utils { diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h index a614bb71ee..a2fe6c79f2 100644 --- a/src/libs/utils/codegeneration.h +++ b/src/libs/utils/codegeneration.h @@ -34,7 +34,7 @@ #define CODEGENERATION_H #include "utils_global.h" -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/libs/utils/completingtextedit.cpp b/src/libs/utils/completingtextedit.cpp index 9d6b9395c5..9881c46925 100644 --- a/src/libs/utils/completingtextedit.cpp +++ b/src/libs/utils/completingtextedit.cpp @@ -32,10 +32,10 @@ #include "completingtextedit.h" -#include <QtGui/QAbstractItemView> -#include <QtGui/QCompleter> -#include <QtGui/QKeyEvent> -#include <QtGui/QScrollBar> +#include <QAbstractItemView> +#include <QCompleter> +#include <QKeyEvent> +#include <QScrollBar> static bool isEndOfWordChar(const QChar &c) { diff --git a/src/libs/utils/completingtextedit.h b/src/libs/utils/completingtextedit.h index 68efe6e435..b10be6dd50 100644 --- a/src/libs/utils/completingtextedit.h +++ b/src/libs/utils/completingtextedit.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QTextEdit> +#include <QTextEdit> QT_BEGIN_NAMESPACE class QCompleter; diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h index 2cf3d9911e..eb9eb216a5 100644 --- a/src/libs/utils/consoleprocess.h +++ b/src/libs/utils/consoleprocess.h @@ -37,10 +37,10 @@ #include "environment.h" -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QProcess> +#include <QObject> +#include <QString> +#include <QStringList> +#include <QProcess> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/libs/utils/consoleprocess_p.h b/src/libs/utils/consoleprocess_p.h index 36c5281acb..8782db7fc3 100644 --- a/src/libs/utils/consoleprocess_p.h +++ b/src/libs/utils/consoleprocess_p.h @@ -35,16 +35,16 @@ #include "consoleprocess.h" -#include <QtCore/QTemporaryFile> +#include <QTemporaryFile> -#include <QtNetwork/QLocalSocket> -#include <QtNetwork/QLocalServer> +#include <QLocalSocket> +#include <QLocalServer> #ifdef Q_OS_WIN # if QT_VERSION >= 0x050000 -# include <QtCore/QWinEventNotifier> +# include <QWinEventNotifier> # else -# include <QtCore/private/qwineventnotifier_p.h> +# include <private/qwineventnotifier_p.h> # endif # include <windows.h> #endif diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index 1ffbe58338..26b12aaada 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -35,9 +35,9 @@ #include "environment.h" #include "qtcprocess.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QSettings> +#include <QCoreApplication> +#include <QDir> +#include <QSettings> #include <sys/stat.h> #include <sys/types.h> diff --git a/src/libs/utils/consoleprocess_win.cpp b/src/libs/utils/consoleprocess_win.cpp index 3451ab3929..ff3b3e1850 100644 --- a/src/libs/utils/consoleprocess_win.cpp +++ b/src/libs/utils/consoleprocess_win.cpp @@ -35,9 +35,9 @@ #include "qtcprocess.h" #include "winutils.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QAbstractEventDispatcher> +#include <QCoreApplication> +#include <QDir> +#include <QAbstractEventDispatcher> #include <stdlib.h> diff --git a/src/libs/utils/crumblepath.cpp b/src/libs/utils/crumblepath.cpp index f600b76dfe..a69258802a 100644 --- a/src/libs/utils/crumblepath.cpp +++ b/src/libs/utils/crumblepath.cpp @@ -33,14 +33,14 @@ #include "crumblepath.h" #include "stylehelper.h" -#include <QtCore/QList> -#include <QtGui/QHBoxLayout> -#include <QtGui/QPushButton> -#include <QtGui/QMenu> -#include <QtGui/QStyle> -#include <QtGui/QResizeEvent> -#include <QtGui/QPainter> -#include <QtGui/QImage> +#include <QList> +#include <QHBoxLayout> +#include <QPushButton> +#include <QMenu> +#include <QStyle> +#include <QResizeEvent> +#include <QPainter> +#include <QImage> #include <qtcassert.h> diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h index 96f6040ba0..c5066c41c8 100644 --- a/src/libs/utils/crumblepath.h +++ b/src/libs/utils/crumblepath.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtGui/QWidget> -#include <QtCore/QVariant> +#include <QWidget> +#include <QVariant> namespace Utils { diff --git a/src/libs/utils/debuggerlanguagechooser.cpp b/src/libs/utils/debuggerlanguagechooser.cpp index 7612707559..ddef12387d 100644 --- a/src/libs/utils/debuggerlanguagechooser.cpp +++ b/src/libs/utils/debuggerlanguagechooser.cpp @@ -32,10 +32,10 @@ #include "debuggerlanguagechooser.h" -#include <QtGui/QHBoxLayout> -#include <QtGui/QCheckBox> -#include <QtGui/QSpinBox> -#include <QtGui/QLabel> +#include <QHBoxLayout> +#include <QCheckBox> +#include <QSpinBox> +#include <QLabel> namespace Utils { diff --git a/src/libs/utils/debuggerlanguagechooser.h b/src/libs/utils/debuggerlanguagechooser.h index 4cb50883f7..5cfae8399b 100644 --- a/src/libs/utils/debuggerlanguagechooser.h +++ b/src/libs/utils/debuggerlanguagechooser.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QCheckBox) QT_FORWARD_DECLARE_CLASS(QLabel) diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp index fd65df3e16..15cabc42fd 100644 --- a/src/libs/utils/detailsbutton.cpp +++ b/src/libs/utils/detailsbutton.cpp @@ -34,10 +34,10 @@ #include <utils/stylehelper.h> -#include <QtCore/QPropertyAnimation> -#include <QtGui/QPaintEvent> -#include <QtGui/QPainter> -#include <QtGui/QStyleOption> +#include <QPropertyAnimation> +#include <QPaintEvent> +#include <QPainter> +#include <QStyleOption> using namespace Utils; diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h index 6dd561e1dc..428bec5c8d 100644 --- a/src/libs/utils/detailsbutton.h +++ b/src/libs/utils/detailsbutton.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtGui/QAbstractButton> -#include <QtGui/QPixmap> +#include <QAbstractButton> +#include <QPixmap> QT_FORWARD_DECLARE_CLASS(QGraphicsOpacityEffect) diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp index c5f73ae39c..6628988f82 100644 --- a/src/libs/utils/detailswidget.cpp +++ b/src/libs/utils/detailswidget.cpp @@ -33,15 +33,15 @@ #include "detailswidget.h" #include "detailsbutton.h" -#include <QtCore/QStack> -#include <QtCore/QPropertyAnimation> - -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QCheckBox> -#include <QtGui/QPainter> -#include <QtGui/QScrollArea> -#include <QtGui/QApplication> +#include <QStack> +#include <QPropertyAnimation> + +#include <QGridLayout> +#include <QLabel> +#include <QCheckBox> +#include <QPainter> +#include <QScrollArea> +#include <QApplication> /*! \class Utils::DetailsWidget diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h index 35eae5d41a..65c9b6da61 100644 --- a/src/libs/utils/detailswidget.h +++ b/src/libs/utils/detailswidget.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace Utils { diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 0734c51d06..4390150f73 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -32,9 +32,9 @@ #include "environment.h" -#include <QtCore/QDir> -#include <QtCore/QProcess> -#include <QtCore/QString> +#include <QDir> +#include <QProcess> +#include <QString> namespace Utils { diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index 123816bf33..29a85962a1 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -35,10 +35,10 @@ #include "utils_global.h" -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QList> +#include <QMap> +#include <QString> +#include <QStringList> namespace Utils { diff --git a/src/libs/utils/environmentmodel.cpp b/src/libs/utils/environmentmodel.cpp index a5a460baec..63d7af5828 100644 --- a/src/libs/utils/environmentmodel.cpp +++ b/src/libs/utils/environmentmodel.cpp @@ -34,7 +34,7 @@ #include <utils/environment.h> -#include <QtGui/QFont> +#include <QFont> namespace Utils { diff --git a/src/libs/utils/environmentmodel.h b/src/libs/utils/environmentmodel.h index e82a5aa28e..6ebf70bd53 100644 --- a/src/libs/utils/environmentmodel.h +++ b/src/libs/utils/environmentmodel.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtCore/QAbstractTableModel> +#include <QAbstractTableModel> namespace Utils { class Environment; diff --git a/src/libs/utils/faketooltip.cpp b/src/libs/utils/faketooltip.cpp index 2b84ba7b60..ee879a8632 100644 --- a/src/libs/utils/faketooltip.cpp +++ b/src/libs/utils/faketooltip.cpp @@ -32,8 +32,8 @@ #include "faketooltip.h" -#include <QtGui/QStyleOption> -#include <QtGui/QStylePainter> +#include <QStyleOption> +#include <QStylePainter> /*! \class Utils::FakeToolTip diff --git a/src/libs/utils/faketooltip.h b/src/libs/utils/faketooltip.h index 78b37b3c7f..2d2f8054b4 100644 --- a/src/libs/utils/faketooltip.h +++ b/src/libs/utils/faketooltip.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace Utils { diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 1d3afb6149..f1b7d807ad 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -32,18 +32,18 @@ #include "fancylineedit.h" -#include <QtCore/QEvent> -#include <QtCore/QDebug> -#include <QtCore/QString> -#include <QtCore/QPropertyAnimation> -#include <QtGui/QApplication> -#include <QtGui/QMenu> -#include <QtGui/QMouseEvent> -#include <QtGui/QLabel> -#include <QtGui/QAbstractButton> -#include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QPaintEvent> +#include <QEvent> +#include <QDebug> +#include <QString> +#include <QPropertyAnimation> +#include <QApplication> +#include <QMenu> +#include <QMouseEvent> +#include <QLabel> +#include <QAbstractButton> +#include <QPainter> +#include <QStyle> +#include <QPaintEvent> /*! \class Utils::FancyLineEdit diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h index 4be9d5d406..6e4471a99c 100644 --- a/src/libs/utils/fancylineedit.h +++ b/src/libs/utils/fancylineedit.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtGui/QLineEdit> -#include <QtGui/QAbstractButton> +#include <QLineEdit> +#include <QAbstractButton> namespace Utils { diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index 9a9b126ce9..1302567c88 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -34,14 +34,14 @@ #include "qtcassert.h" -#include <QtCore/QList> -#include <QtCore/QHash> - -#include <QtGui/QAction> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QMenu> -#include <QtGui/QDockWidget> -#include <QtCore/QSettings> +#include <QList> +#include <QHash> + +#include <QAction> +#include <QContextMenuEvent> +#include <QMenu> +#include <QDockWidget> +#include <QSettings> static const char lockedKeyC[] = "Locked"; static const char stateKeyC[] = "State"; diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h index 2b695db34b..f81f02638e 100644 --- a/src/libs/utils/fancymainwindow.h +++ b/src/libs/utils/fancymainwindow.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QMainWindow> +#include <QMainWindow> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp index 33c820bb22..06c7f979d5 100644 --- a/src/libs/utils/fileinprojectfinder.cpp +++ b/src/libs/utils/fileinprojectfinder.cpp @@ -33,8 +33,8 @@ #include "fileinprojectfinder.h" #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QUrl> +#include <QFileInfo> +#include <QUrl> namespace Utils { diff --git a/src/libs/utils/fileinprojectfinder.h b/src/libs/utils/fileinprojectfinder.h index 0b5cd6a81a..f528837a98 100644 --- a/src/libs/utils/fileinprojectfinder.h +++ b/src/libs/utils/fileinprojectfinder.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QHash> -#include <QtCore/QStringList> +#include <QHash> +#include <QStringList> QT_FORWARD_DECLARE_CLASS(QUrl) diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp index b034c58fcf..bc37cfa4b6 100644 --- a/src/libs/utils/filenamevalidatinglineedit.cpp +++ b/src/libs/utils/filenamevalidatinglineedit.cpp @@ -33,8 +33,8 @@ #include "filenamevalidatinglineedit.h" #include "qtcassert.h" -#include <QtCore/QRegExp> -#include <QtCore/QDebug> +#include <QRegExp> +#include <QDebug> /*! \class Utils::FileNameValidatingLineEdit diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 7387f51c9c..0f2f17dee9 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -33,12 +33,12 @@ #include "filesearch.h" #include <cctype> -#include <QtCore/QBuffer> -#include <QtCore/QFile> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QRegExp> -#include <QtCore/QCoreApplication> -#include <QtCore/QTextCodec> +#include <QBuffer> +#include <QFile> +#include <QtConcurrentRun> +#include <QRegExp> +#include <QCoreApplication> +#include <QTextCodec> #include "runextensions.h" diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index df09d0e7bc..3d7de6166a 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -35,12 +35,12 @@ #include "utils_global.h" -#include <QtCore/QStringList> -#include <QtCore/QFuture> -#include <QtCore/QMap> -#include <QtCore/QStack> -#include <QtCore/QDir> -#include <QtGui/QTextDocument> +#include <QStringList> +#include <QFuture> +#include <QMap> +#include <QStack> +#include <QDir> +#include <QTextDocument> QT_FORWARD_DECLARE_CLASS(QTextCodec) diff --git a/src/libs/utils/filesystemwatcher.cpp b/src/libs/utils/filesystemwatcher.cpp index f8ac4fa8fa..35d4889870 100644 --- a/src/libs/utils/filesystemwatcher.cpp +++ b/src/libs/utils/filesystemwatcher.cpp @@ -32,11 +32,11 @@ #include "filesystemwatcher.h" -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QFileSystemWatcher> -#include <QtCore/QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QFileSystemWatcher> +#include <QDateTime> enum { debug = 0 }; diff --git a/src/libs/utils/filesystemwatcher.h b/src/libs/utils/filesystemwatcher.h index 62b78f5738..a75defffcb 100644 --- a/src/libs/utils/filesystemwatcher.h +++ b/src/libs/utils/filesystemwatcher.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> namespace Utils { class FileSystemWatcherPrivate; diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 9a9c827217..3c201d31c7 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -35,13 +35,13 @@ #include "qtcassert.h" -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTemporaryFile> -#include <QtCore/QDateTime> -#include <QtCore/QDataStream> -#include <QtCore/QTextStream> -#include <QtGui/QMessageBox> +#include <QDir> +#include <QFileInfo> +#include <QTemporaryFile> +#include <QDateTime> +#include <QDataStream> +#include <QTextStream> +#include <QMessageBox> namespace Utils { diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index fd46d594d2..e47e1c96fe 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -35,11 +35,11 @@ #include "utils_global.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QIODevice> -#include <QtCore/QXmlStreamWriter> // Mac. -#include <QtCore/QFileInfo> -#include <QtCore/QMetaType> +#include <QCoreApplication> +#include <QIODevice> +#include <QXmlStreamWriter> // Mac. +#include <QFileInfo> +#include <QMetaType> QT_BEGIN_NAMESPACE class QFile; diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp index 6f25a03819..6cfe526acd 100644 --- a/src/libs/utils/filewizarddialog.cpp +++ b/src/libs/utils/filewizarddialog.cpp @@ -33,7 +33,7 @@ #include "filewizarddialog.h" #include "filewizardpage.h" -#include <QtGui/QAbstractButton> +#include <QAbstractButton> /*! \class Utils::FileWizardDialog diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h index b71d29958a..e65ee0a01a 100644 --- a/src/libs/utils/filewizardpage.h +++ b/src/libs/utils/filewizardpage.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Utils { diff --git a/src/libs/utils/flowlayout.cpp b/src/libs/utils/flowlayout.cpp index 80d2b56608..165d2035ca 100644 --- a/src/libs/utils/flowlayout.cpp +++ b/src/libs/utils/flowlayout.cpp @@ -32,9 +32,9 @@ #include "flowlayout.h" -#include <QtCore/QRect> -#include <QtGui/QWidgetItem> -#include <QtGui/QWidget> +#include <QRect> +#include <QWidgetItem> +#include <QWidget> using namespace Utils; diff --git a/src/libs/utils/flowlayout.h b/src/libs/utils/flowlayout.h index 2eba623ad4..ca757327b2 100644 --- a/src/libs/utils/flowlayout.h +++ b/src/libs/utils/flowlayout.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtGui/QLayout> -#include <QtGui/QStyle> +#include <QLayout> +#include <QStyle> namespace Utils { diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp index 08fa3b6b48..267090b4ff 100644 --- a/src/libs/utils/historycompleter.cpp +++ b/src/libs/utils/historycompleter.cpp @@ -32,15 +32,15 @@ #include "historycompleter.h" -#include <QtCore/QAbstractListModel> -#include <QtCore/QSettings> - -#include <QtGui/QLineEdit> -#include <QtGui/QKeyEvent> -#include <QtGui/QItemDelegate> -#include <QtGui/QListView> -#include <QtGui/QPainter> -#include <QtGui/QStyle> +#include <QAbstractListModel> +#include <QSettings> + +#include <QLineEdit> +#include <QKeyEvent> +#include <QItemDelegate> +#include <QListView> +#include <QPainter> +#include <QStyle> static const char SETTINGS_PREFIX[] = "CompleterHistory/"; diff --git a/src/libs/utils/historycompleter.h b/src/libs/utils/historycompleter.h index 7ee5a1ac17..2b813e1aaa 100644 --- a/src/libs/utils/historycompleter.h +++ b/src/libs/utils/historycompleter.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QCompleter> +#include <QCompleter> QT_FORWARD_DECLARE_CLASS(QSettings) diff --git a/src/libs/utils/htmldocextractor.cpp b/src/libs/utils/htmldocextractor.cpp index 247033dc41..fcfd0ea188 100644 --- a/src/libs/utils/htmldocextractor.cpp +++ b/src/libs/utils/htmldocextractor.cpp @@ -32,10 +32,10 @@ #include "htmldocextractor.h" -#include <QtCore/QLatin1String> -#include <QtCore/QLatin1Char> -#include <QtCore/QStringList> -#include <QtCore/QRegExp> +#include <QLatin1String> +#include <QLatin1Char> +#include <QStringList> +#include <QRegExp> using namespace Utils; diff --git a/src/libs/utils/htmldocextractor.h b/src/libs/utils/htmldocextractor.h index 2331bde76b..3718a5dc7b 100644 --- a/src/libs/utils/htmldocextractor.h +++ b/src/libs/utils/htmldocextractor.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtCore/QString> +#include <QString> namespace Utils { diff --git a/src/libs/utils/ipaddresslineedit.cpp b/src/libs/utils/ipaddresslineedit.cpp index a63368ed65..5177b3dcc5 100644 --- a/src/libs/utils/ipaddresslineedit.cpp +++ b/src/libs/utils/ipaddresslineedit.cpp @@ -32,7 +32,7 @@ #include "ipaddresslineedit.h" -#include <QtGui/QRegExpValidator> +#include <QRegExpValidator> /*! \class Utils::IpAddressLineEdit diff --git a/src/libs/utils/iwelcomepage.h b/src/libs/utils/iwelcomepage.h index b63be0b9b6..38a973bb7c 100644 --- a/src/libs/utils/iwelcomepage.h +++ b/src/libs/utils/iwelcomepage.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtCore/QObject> -#include <QtCore/QUrl> +#include <QObject> +#include <QUrl> QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine) diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp index 5719f8f695..fbbdf1d86a 100644 --- a/src/libs/utils/json.cpp +++ b/src/libs/utils/json.cpp @@ -35,11 +35,11 @@ #include <utils/qtcassert.h> #include <utils/fileutils.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtCore/QStringBuilder> -#include <QtCore/QDebug> +#include <QDir> +#include <QFileInfo> +#include <QFile> +#include <QStringBuilder> +#include <QDebug> using namespace Utils; diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h index ed8f047c59..1b95f4121c 100644 --- a/src/libs/utils/json.h +++ b/src/libs/utils/json.h @@ -35,16 +35,16 @@ #include "utils_global.h" -#include <QtCore/QHash> -#include <QtCore/QVector> -#include <QtCore/QScopedPointer> -#include <QtCore/QVariant> -#include <QtCore/QStringList> -#include <QtCore/QLatin1String> -#include <QtCore/QDateTime> -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptValue> -#include <QtScript/QScriptValueIterator> +#include <QHash> +#include <QVector> +#include <QScopedPointer> +#include <QVariant> +#include <QStringList> +#include <QLatin1String> +#include <QDateTime> +#include <QScriptEngine> +#include <QScriptValue> +#include <QScriptValueIterator> namespace Utils { diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h index de60387567..9fc458f7c7 100644 --- a/src/libs/utils/linecolumnlabel.h +++ b/src/libs/utils/linecolumnlabel.h @@ -34,7 +34,7 @@ #define LINECOLUMNLABEL_H #include "utils_global.h" -#include <QtGui/QLabel> +#include <QLabel> namespace Utils { diff --git a/src/libs/utils/listutils.h b/src/libs/utils/listutils.h index 346b549255..06afc2c827 100644 --- a/src/libs/utils/listutils.h +++ b/src/libs/utils/listutils.h @@ -33,7 +33,7 @@ #ifndef LISTUTILS_H #define LISTUTILS_H -#include <QtCore/QList> +#include <QList> namespace Utils { diff --git a/src/libs/utils/multitask.h b/src/libs/utils/multitask.h index 71c09a6453..3d9b16b0ff 100644 --- a/src/libs/utils/multitask.h +++ b/src/libs/utils/multitask.h @@ -36,12 +36,12 @@ #include "utils_global.h" #include "runextensions.h" -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QEventLoop> -#include <QtCore/QFutureWatcher> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QThreadPool> +#include <QObject> +#include <QList> +#include <QEventLoop> +#include <QFutureWatcher> +#include <QtConcurrentRun> +#include <QThreadPool> #include <QtDebug> diff --git a/src/libs/utils/navigationtreeview.cpp b/src/libs/utils/navigationtreeview.cpp index 19b3ae198c..962f240d28 100644 --- a/src/libs/utils/navigationtreeview.cpp +++ b/src/libs/utils/navigationtreeview.cpp @@ -32,11 +32,11 @@ #include "navigationtreeview.h" -#include <QtGui/QHeaderView> -#include <QtGui/QFocusEvent> +#include <QHeaderView> +#include <QFocusEvent> #ifdef Q_OS_MAC -#include <QtGui/QKeyEvent> +#include <QKeyEvent> #endif /*! diff --git a/src/libs/utils/navigationtreeview.h b/src/libs/utils/navigationtreeview.h index 4ad7b9cd5b..58a6a6095c 100644 --- a/src/libs/utils/navigationtreeview.h +++ b/src/libs/utils/navigationtreeview.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QTreeView> +#include <QTreeView> namespace Utils { diff --git a/src/libs/utils/networkaccessmanager.cpp b/src/libs/utils/networkaccessmanager.cpp index 2ff0a74e16..55ce1af26d 100644 --- a/src/libs/utils/networkaccessmanager.cpp +++ b/src/libs/utils/networkaccessmanager.cpp @@ -32,9 +32,9 @@ #include "networkaccessmanager.h" -#include <QtCore/QLocale> -#include <QtCore/QUrl> -#include <QtNetwork/QNetworkReply> +#include <QLocale> +#include <QUrl> +#include <QNetworkReply> #ifdef Q_OS_UNIX #include <sys/utsname.h> diff --git a/src/libs/utils/networkaccessmanager.h b/src/libs/utils/networkaccessmanager.h index 0a3af715c2..6dbec736cc 100644 --- a/src/libs/utils/networkaccessmanager.h +++ b/src/libs/utils/networkaccessmanager.h @@ -32,7 +32,7 @@ #include "utils_global.h" -#include <QtNetwork/QNetworkAccessManager> +#include <QNetworkAccessManager> QT_FORWARD_DECLARE_CLASS(QUrl) diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp index 792d3d29fb..a94e686924 100644 --- a/src/libs/utils/newclasswidget.cpp +++ b/src/libs/utils/newclasswidget.cpp @@ -35,12 +35,12 @@ #include <utils/filewizardpage.h> -#include <QtGui/QFileDialog> -#include <QtCore/QFileInfo> -#include <QtCore/QStringList> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QFileDialog> +#include <QFileInfo> +#include <QStringList> +#include <QDir> +#include <QDebug> +#include <QRegExp> enum { debugNewClassWidget = 0 }; diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h index 3628f91b9b..3bd9b2385d 100644 --- a/src/libs/utils/newclasswidget.h +++ b/src/libs/utils/newclasswidget.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QStringList; diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index 88d4b3c57c..93b74a35f0 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -32,10 +32,10 @@ #include "outputformatter.h" -#include <QtGui/QPlainTextEdit> -#include <QtGui/QColor> +#include <QPlainTextEdit> +#include <QColor> -#include <QtCore/QString> +#include <QString> using namespace Utils; diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index 2a32fa5113..93c05f5288 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -36,8 +36,8 @@ #include "utils_global.h" #include "outputformat.h" -#include <QtCore/QObject> -#include <QtGui/QFont> +#include <QObject> +#include <QFont> QT_BEGIN_NAMESPACE class QPlainTextEdit; diff --git a/src/libs/utils/parameteraction.h b/src/libs/utils/parameteraction.h index 7259a2d25e..45f84cbe65 100644 --- a/src/libs/utils/parameteraction.h +++ b/src/libs/utils/parameteraction.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QAction> +#include <QAction> namespace Utils { diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 9ac747cf50..4a3cf3a723 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -38,18 +38,18 @@ #include "synchronousprocess.h" -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QProcess> - -#include <QtGui/qevent.h> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QSettings> +#include <QProcess> + +#include <qevent.h> +#include <QDesktopServices> +#include <QFileDialog> +#include <QHBoxLayout> +#include <QLineEdit> +#include <QPushButton> /*! \class Utils::PathChooser diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h index 246e61140f..517fb4644f 100644 --- a/src/libs/utils/pathchooser.h +++ b/src/libs/utils/pathchooser.h @@ -37,7 +37,7 @@ #include "fileutils.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QAbstractButton; diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp index 54c18b6aa0..f88aefa3a9 100644 --- a/src/libs/utils/pathlisteditor.cpp +++ b/src/libs/utils/pathlisteditor.cpp @@ -32,22 +32,22 @@ #include "pathlisteditor.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QToolButton> -#include <QtGui/QSpacerItem> -#include <QtGui/QFileDialog> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> -#include <QtGui/QMenu> -#include <QtGui/QAction> - -#include <QtCore/QSignalMapper> -#include <QtCore/QMimeData> -#include <QtCore/QSharedPointer> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QPlainTextEdit> +#include <QToolButton> +#include <QSpacerItem> +#include <QFileDialog> +#include <QTextCursor> +#include <QTextBlock> +#include <QMenu> +#include <QAction> + +#include <QSignalMapper> +#include <QMimeData> +#include <QSharedPointer> +#include <QDir> +#include <QDebug> /*! \class Utils::PathListEditor diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h index 99c05e1144..0604d8da1a 100644 --- a/src/libs/utils/pathlisteditor.h +++ b/src/libs/utils/pathlisteditor.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtGui/QWidget> -#include <QtCore/QStringList> +#include <QWidget> +#include <QStringList> namespace Utils { diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp index 092c6ba05c..82d470c5be 100644 --- a/src/libs/utils/persistentsettings.cpp +++ b/src/libs/utils/persistentsettings.cpp @@ -36,14 +36,14 @@ #include <utils/fileutils.h> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QVariant> -#include <QtCore/QStack> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/QDateTime> +#include <QDebug> +#include <QFile> +#include <QVariant> +#include <QStack> +#include <QXmlStreamAttributes> +#include <QXmlStreamReader> +#include <QXmlStreamWriter> +#include <QDateTime> #include <utils/qtcassert.h> diff --git a/src/libs/utils/persistentsettings.h b/src/libs/utils/persistentsettings.h index 6160f9030c..5ac353bb21 100644 --- a/src/libs/utils/persistentsettings.h +++ b/src/libs/utils/persistentsettings.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtCore/QMap> -#include <QtCore/QVariant> +#include <QMap> +#include <QVariant> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp index 1182748cc2..bf6e7f89fe 100644 --- a/src/libs/utils/projectintropage.cpp +++ b/src/libs/utils/projectintropage.cpp @@ -34,9 +34,9 @@ #include "filewizardpage.h" #include "ui_projectintropage.h" -#include <QtGui/QMessageBox> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QMessageBox> +#include <QDir> +#include <QFileInfo> /*! diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h index a3bb33a789..88163d5ea5 100644 --- a/src/libs/utils/projectintropage.h +++ b/src/libs/utils/projectintropage.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Utils { diff --git a/src/libs/utils/proxyaction.h b/src/libs/utils/proxyaction.h index 0f381087a4..7149552848 100644 --- a/src/libs/utils/proxyaction.h +++ b/src/libs/utils/proxyaction.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtCore/QPointer> -#include <QtGui/QAction> +#include <QPointer> +#include <QAction> namespace Utils { diff --git a/src/libs/utils/qtcassert.h b/src/libs/utils/qtcassert.h index 5cd30c8a45..11a0df20b3 100644 --- a/src/libs/utils/qtcassert.h +++ b/src/libs/utils/qtcassert.h @@ -33,7 +33,7 @@ #ifndef QTC_ASSERT_H #define QTC_ASSERT_H -#include <QtCore/QDebug> +#include <QDebug> #define QTC_ASSERT_STRINGIFY_INTERNAL(x) #x #define QTC_ASSERT_STRINGIFY(x) QTC_ASSERT_STRINGIFY_INTERNAL(x) diff --git a/src/libs/utils/qtcolorbutton.cpp b/src/libs/utils/qtcolorbutton.cpp index 40a0d3b7bf..0056e4c3bb 100644 --- a/src/libs/utils/qtcolorbutton.cpp +++ b/src/libs/utils/qtcolorbutton.cpp @@ -32,12 +32,12 @@ #include "qtcolorbutton.h" -#include <QtCore/QMimeData> -#include <QtGui/QApplication> -#include <QtGui/QColorDialog> -#include <QtGui/QDragEnterEvent> -#include <QtGui/QPainter> -#include <QtGui/QDrag> +#include <QMimeData> +#include <QApplication> +#include <QColorDialog> +#include <QDragEnterEvent> +#include <QPainter> +#include <QDrag> namespace Utils { diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h index 6e194efd2b..d0c194b7f7 100644 --- a/src/libs/utils/qtcolorbutton.h +++ b/src/libs/utils/qtcolorbutton.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QToolButton> +#include <QToolButton> namespace Utils { diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 662c182797..c8d70380b9 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -33,9 +33,9 @@ #include "qtcprocess.h" #include "stringutils.h" -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QDebug> +#include <QCoreApplication> #ifdef Q_OS_WIN #include <qt_windows.h> @@ -776,7 +776,7 @@ QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(MxSave, Q_MOVABLE_TYPE); QT_END_NAMESPACE -#include <QtCore/QStack> +#include <QStack> #endif diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index f5e11ce3ae..fb901d216f 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -33,7 +33,7 @@ #ifndef QTCPROCESS_H #define QTCPROCESS_H -#include <QtCore/QProcess> +#include <QProcess> #include "utils_global.h" diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index ae781d7b4b..02fe16f88a 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -32,11 +32,11 @@ #include "reloadpromptutils.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QAbstractButton> +#include <QCoreApplication> +#include <QDir> +#include <QMessageBox> +#include <QPushButton> +#include <QAbstractButton> using namespace Utils; diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp index ae358a10bb..f2a31e9fbf 100644 --- a/src/libs/utils/savedaction.cpp +++ b/src/libs/utils/savedaction.cpp @@ -35,18 +35,18 @@ #include <utils/qtcassert.h> #include <utils/pathchooser.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> - -#include <QtGui/QAbstractButton> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QCheckBox> -#include <QtGui/QGroupBox> -#include <QtGui/QLineEdit> -#include <QtGui/QRadioButton> -#include <QtGui/QSpinBox> -#include <QtGui/QTextEdit> +#include <QDebug> +#include <QSettings> + +#include <QAbstractButton> +#include <QAction> +#include <QActionGroup> +#include <QCheckBox> +#include <QGroupBox> +#include <QLineEdit> +#include <QRadioButton> +#include <QSpinBox> +#include <QTextEdit> using namespace Utils; diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h index 0a0b398f68..59123ef899 100644 --- a/src/libs/utils/savedaction.h +++ b/src/libs/utils/savedaction.h @@ -35,11 +35,11 @@ #include "utils_global.h" -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtCore/QList> +#include <QString> +#include <QVariant> +#include <QList> -#include <QtGui/QAction> +#include <QAction> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/libs/utils/savefile.h b/src/libs/utils/savefile.h index 8662dd1971..dfddf99b26 100644 --- a/src/libs/utils/savefile.h +++ b/src/libs/utils/savefile.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtCore/QTemporaryFile> +#include <QTemporaryFile> namespace Utils { diff --git a/src/libs/utils/settingsselector.cpp b/src/libs/utils/settingsselector.cpp index 31a54c273c..8c54ebcad5 100644 --- a/src/libs/utils/settingsselector.cpp +++ b/src/libs/utils/settingsselector.cpp @@ -32,18 +32,18 @@ #include "settingsselector.h" -#include <QtCore/QAbstractItemModel> -#include <QtCore/QVariant> - -#include <QtGui/QAction> -#include <QtGui/QComboBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QInputDialog> -#include <QtGui/QLabel> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QSpacerItem> +#include <QAbstractItemModel> +#include <QVariant> + +#include <QAction> +#include <QComboBox> +#include <QHBoxLayout> +#include <QInputDialog> +#include <QLabel> +#include <QMenu> +#include <QMessageBox> +#include <QPushButton> +#include <QSpacerItem> namespace Utils { diff --git a/src/libs/utils/settingsselector.h b/src/libs/utils/settingsselector.h index ab67d080c4..5ae1042e6a 100644 --- a/src/libs/utils/settingsselector.h +++ b/src/libs/utils/settingsselector.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QAbstractItemModel; diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h index e5e55200dd..dcb5b74668 100644 --- a/src/libs/utils/settingsutils.h +++ b/src/libs/utils/settingsutils.h @@ -33,10 +33,10 @@ #ifndef SETTINGSUTILS_H #define SETTINGSUTILS_H -#include <QtCore/QSettings> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QSettings> +#include <QString> +#include <QStringList> +#include <QVariant> namespace Utils { diff --git a/src/libs/utils/ssh/sftpchannel.cpp b/src/libs/utils/ssh/sftpchannel.cpp index bf532e5b35..d5cf0f6b67 100644 --- a/src/libs/utils/ssh/sftpchannel.cpp +++ b/src/libs/utils/ssh/sftpchannel.cpp @@ -37,8 +37,8 @@ #include "sshincomingpacket_p.h" #include "sshsendfacility_p.h" -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QDir> +#include <QFile> /*! \class Utils::SftpChannel diff --git a/src/libs/utils/ssh/sftpchannel.h b/src/libs/utils/ssh/sftpchannel.h index bc9911bf23..31e99c3147 100644 --- a/src/libs/utils/ssh/sftpchannel.h +++ b/src/libs/utils/ssh/sftpchannel.h @@ -38,10 +38,10 @@ #include <utils/utils_global.h> -#include <QtCore/QByteArray> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QByteArray> +#include <QObject> +#include <QSharedPointer> +#include <QString> namespace Utils { diff --git a/src/libs/utils/ssh/sftpchannel_p.h b/src/libs/utils/ssh/sftpchannel_p.h index a5fc47de90..c2b2f79b18 100644 --- a/src/libs/utils/ssh/sftpchannel_p.h +++ b/src/libs/utils/ssh/sftpchannel_p.h @@ -39,8 +39,8 @@ #include "sftpoutgoingpacket_p.h" #include "sshchannel_p.h" -#include <QtCore/QByteArray> -#include <QtCore/QMap> +#include <QByteArray> +#include <QMap> namespace Utils { class SftpChannel; diff --git a/src/libs/utils/ssh/sftpoperation.cpp b/src/libs/utils/ssh/sftpoperation.cpp index c32fc46501..733741a9cb 100644 --- a/src/libs/utils/ssh/sftpoperation.cpp +++ b/src/libs/utils/ssh/sftpoperation.cpp @@ -34,7 +34,7 @@ #include "sftpoutgoingpacket_p.h" -#include <QtCore/QFile> +#include <QFile> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sftpoperation_p.h b/src/libs/utils/ssh/sftpoperation_p.h index 8ea75f4281..eeaa69ac10 100644 --- a/src/libs/utils/ssh/sftpoperation_p.h +++ b/src/libs/utils/ssh/sftpoperation_p.h @@ -35,10 +35,10 @@ #include "sftpdefs.h" -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QSharedPointer> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QFile; diff --git a/src/libs/utils/ssh/sftpoutgoingpacket.cpp b/src/libs/utils/ssh/sftpoutgoingpacket.cpp index ac9e32f981..38412e6643 100644 --- a/src/libs/utils/ssh/sftpoutgoingpacket.cpp +++ b/src/libs/utils/ssh/sftpoutgoingpacket.cpp @@ -34,7 +34,7 @@ #include "sshpacket_p.h" -#include <QtCore/QtEndian> +#include <QtEndian> #include <limits> diff --git a/src/libs/utils/ssh/sftppacket_p.h b/src/libs/utils/ssh/sftppacket_p.h index 17d157a467..9666ef1e11 100644 --- a/src/libs/utils/ssh/sftppacket_p.h +++ b/src/libs/utils/ssh/sftppacket_p.h @@ -33,9 +33,9 @@ #ifndef SFTPPACKET_P_H #define SFTPPACKET_P_H -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QByteArray> +#include <QList> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshcapabilities.cpp b/src/libs/utils/ssh/sshcapabilities.cpp index 76f80919ff..a5aa08ea77 100644 --- a/src/libs/utils/ssh/sshcapabilities.cpp +++ b/src/libs/utils/ssh/sshcapabilities.cpp @@ -34,8 +34,8 @@ #include "sshexception_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QString> +#include <QCoreApplication> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshcapabilities_p.h b/src/libs/utils/ssh/sshcapabilities_p.h index eb1e99fe0d..cf322e6711 100644 --- a/src/libs/utils/ssh/sshcapabilities_p.h +++ b/src/libs/utils/ssh/sshcapabilities_p.h @@ -33,8 +33,8 @@ #ifndef CAPABILITIES_P_H #define CAPABILITIES_P_H -#include <QtCore/QByteArray> -#include <QtCore/QList> +#include <QByteArray> +#include <QList> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshchannel.cpp b/src/libs/utils/ssh/sshchannel.cpp index ead09d7f09..80e564c5cb 100644 --- a/src/libs/utils/ssh/sshchannel.cpp +++ b/src/libs/utils/ssh/sshchannel.cpp @@ -37,7 +37,7 @@ #include <botan/exceptn.h> -#include <QtCore/QTimer> +#include <QTimer> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshchannel_p.h b/src/libs/utils/ssh/sshchannel_p.h index fb626b1b4e..89e43d032b 100644 --- a/src/libs/utils/ssh/sshchannel_p.h +++ b/src/libs/utils/ssh/sshchannel_p.h @@ -33,9 +33,9 @@ #ifndef SSHCHANNEL_P_H #define SSHCHANNEL_P_H -#include <QtCore/QByteArray> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QByteArray> +#include <QObject> +#include <QString> QT_FORWARD_DECLARE_CLASS(QTimer) diff --git a/src/libs/utils/ssh/sshchannelmanager.cpp b/src/libs/utils/ssh/sshchannelmanager.cpp index c7d5493b3a..3ce488e2bc 100644 --- a/src/libs/utils/ssh/sshchannelmanager.cpp +++ b/src/libs/utils/ssh/sshchannelmanager.cpp @@ -39,7 +39,7 @@ #include "sshremoteprocess_p.h" #include "sshsendfacility_p.h" -#include <QtCore/QList> +#include <QList> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshchannelmanager_p.h b/src/libs/utils/ssh/sshchannelmanager_p.h index 71fdfc914b..ab88206a73 100644 --- a/src/libs/utils/ssh/sshchannelmanager_p.h +++ b/src/libs/utils/ssh/sshchannelmanager_p.h @@ -33,9 +33,9 @@ #ifndef SSHCHANNELLAYER_P_H #define SSHCHANNELLAYER_P_H -#include <QtCore/QHash> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QHash> +#include <QObject> +#include <QSharedPointer> namespace Utils { diff --git a/src/libs/utils/ssh/sshconnection.cpp b/src/libs/utils/ssh/sshconnection.cpp index 8dbfead8d2..08b5d8eacc 100644 --- a/src/libs/utils/ssh/sshconnection.cpp +++ b/src/libs/utils/ssh/sshconnection.cpp @@ -46,11 +46,11 @@ #include <botan/exceptn.h> #include <botan/init.h> -#include <QtCore/QFile> -#include <QtCore/QMutex> -#include <QtCore/QMutexLocker> -#include <QtNetwork/QNetworkProxy> -#include <QtNetwork/QTcpSocket> +#include <QFile> +#include <QMutex> +#include <QMutexLocker> +#include <QNetworkProxy> +#include <QTcpSocket> /*! \class Utils::SshConnection diff --git a/src/libs/utils/ssh/sshconnection.h b/src/libs/utils/ssh/sshconnection.h index a9aa532c18..983c6c6890 100644 --- a/src/libs/utils/ssh/sshconnection.h +++ b/src/libs/utils/ssh/sshconnection.h @@ -37,11 +37,11 @@ #include <utils/utils_global.h> -#include <QtCore/QByteArray> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> -#include <QtNetwork/QHostAddress> +#include <QByteArray> +#include <QObject> +#include <QSharedPointer> +#include <QString> +#include <QHostAddress> namespace Utils { class SftpChannel; diff --git a/src/libs/utils/ssh/sshconnection_p.h b/src/libs/utils/ssh/sshconnection_p.h index 896a5a3492..4756e05202 100644 --- a/src/libs/utils/ssh/sshconnection_p.h +++ b/src/libs/utils/ssh/sshconnection_p.h @@ -39,12 +39,12 @@ #include "sshremoteprocess.h" #include "sshsendfacility_p.h" -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QPair> -#include <QtCore/QScopedPointer> -#include <QtCore/QTimer> +#include <QHash> +#include <QList> +#include <QObject> +#include <QPair> +#include <QScopedPointer> +#include <QTimer> QT_BEGIN_NAMESPACE class QTcpSocket; diff --git a/src/libs/utils/ssh/sshconnectionmanager.cpp b/src/libs/utils/ssh/sshconnectionmanager.cpp index e594f2741f..8c1c8cd03e 100644 --- a/src/libs/utils/ssh/sshconnectionmanager.cpp +++ b/src/libs/utils/ssh/sshconnectionmanager.cpp @@ -34,12 +34,12 @@ #include "sshconnection.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QList> -#include <QtCore/QMutex> -#include <QtCore/QMutexLocker> -#include <QtCore/QObject> -#include <QtCore/QThread> +#include <QCoreApplication> +#include <QList> +#include <QMutex> +#include <QMutexLocker> +#include <QObject> +#include <QThread> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshconnectionmanager.h b/src/libs/utils/ssh/sshconnectionmanager.h index a7ecfbb171..3b26d6c83b 100644 --- a/src/libs/utils/ssh/sshconnectionmanager.h +++ b/src/libs/utils/ssh/sshconnectionmanager.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QScopedPointer> -#include <QtCore/QSharedPointer> +#include <QScopedPointer> +#include <QSharedPointer> namespace Utils { class SshConnection; diff --git a/src/libs/utils/ssh/sshcryptofacility.cpp b/src/libs/utils/ssh/sshcryptofacility.cpp index cf0f1a579c..d5386d91c6 100644 --- a/src/libs/utils/ssh/sshcryptofacility.cpp +++ b/src/libs/utils/ssh/sshcryptofacility.cpp @@ -51,8 +51,8 @@ #include <botan/pubkey.h> #include <botan/rsa.h> -#include <QtCore/QDebug> -#include <QtCore/QList> +#include <QDebug> +#include <QList> #include <string> diff --git a/src/libs/utils/ssh/sshcryptofacility_p.h b/src/libs/utils/ssh/sshcryptofacility_p.h index c0c5f2a398..b19c18b9f4 100644 --- a/src/libs/utils/ssh/sshcryptofacility_p.h +++ b/src/libs/utils/ssh/sshcryptofacility_p.h @@ -36,8 +36,8 @@ #include <botan/auto_rng.h> #include <botan/symkey.h> -#include <QtCore/QByteArray> -#include <QtCore/QScopedPointer> +#include <QByteArray> +#include <QScopedPointer> namespace Botan { class BigInt; diff --git a/src/libs/utils/ssh/sshexception_p.h b/src/libs/utils/ssh/sshexception_p.h index 8efa4e2987..e21c9d9fc9 100644 --- a/src/libs/utils/ssh/sshexception_p.h +++ b/src/libs/utils/ssh/sshexception_p.h @@ -35,9 +35,9 @@ #include "ssherrors.h" -#include <QtCore/QByteArray> -#include <QtCore/QCoreApplication> -#include <QtCore/QString> +#include <QByteArray> +#include <QCoreApplication> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshincomingpacket_p.h b/src/libs/utils/ssh/sshincomingpacket_p.h index 689f035636..e632881d9b 100644 --- a/src/libs/utils/ssh/sshincomingpacket_p.h +++ b/src/libs/utils/ssh/sshincomingpacket_p.h @@ -38,8 +38,8 @@ #include "sshcryptofacility_p.h" #include "sshpacketparser_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshkeyexchange_p.h b/src/libs/utils/ssh/sshkeyexchange_p.h index f07cd7344e..83be2fad86 100644 --- a/src/libs/utils/ssh/sshkeyexchange_p.h +++ b/src/libs/utils/ssh/sshkeyexchange_p.h @@ -35,8 +35,8 @@ #include <botan/dh.h> -#include <QtCore/QByteArray> -#include <QtCore/QScopedPointer> +#include <QByteArray> +#include <QScopedPointer> namespace Botan { class HashFunction; } diff --git a/src/libs/utils/ssh/sshkeygenerator.cpp b/src/libs/utils/ssh/sshkeygenerator.cpp index 4484882e43..3a1752c343 100644 --- a/src/libs/utils/ssh/sshkeygenerator.cpp +++ b/src/libs/utils/ssh/sshkeygenerator.cpp @@ -45,8 +45,8 @@ #include <botan/rsa.h> #include <botan/x509_key.h> -#include <QtCore/QDateTime> -#include <QtGui/QInputDialog> +#include <QDateTime> +#include <QInputDialog> #include <string> diff --git a/src/libs/utils/ssh/sshkeygenerator.h b/src/libs/utils/ssh/sshkeygenerator.h index d615bf5125..506039e3bc 100644 --- a/src/libs/utils/ssh/sshkeygenerator.h +++ b/src/libs/utils/ssh/sshkeygenerator.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QSharedPointer> +#include <QCoreApplication> +#include <QSharedPointer> namespace Botan { class Private_Key; diff --git a/src/libs/utils/ssh/sshkeypasswordretriever.cpp b/src/libs/utils/ssh/sshkeypasswordretriever.cpp index 4fe24c8129..7c00751ec6 100644 --- a/src/libs/utils/ssh/sshkeypasswordretriever.cpp +++ b/src/libs/utils/ssh/sshkeypasswordretriever.cpp @@ -31,9 +31,9 @@ **************************************************************************/ #include "sshkeypasswordretriever_p.h" -#include <QtCore/QString> -#include <QtGui/QApplication> -#include <QtGui/QInputDialog> +#include <QString> +#include <QApplication> +#include <QInputDialog> #include <iostream> diff --git a/src/libs/utils/ssh/sshoutgoingpacket.cpp b/src/libs/utils/ssh/sshoutgoingpacket.cpp index 16594c9f0d..e79f65a60e 100644 --- a/src/libs/utils/ssh/sshoutgoingpacket.cpp +++ b/src/libs/utils/ssh/sshoutgoingpacket.cpp @@ -35,7 +35,7 @@ #include "sshcapabilities_p.h" #include "sshcryptofacility_p.h" -#include <QtCore/QtEndian> +#include <QtEndian> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshpacket.cpp b/src/libs/utils/ssh/sshpacket.cpp index 8cf741adb3..7af1f25078 100644 --- a/src/libs/utils/ssh/sshpacket.cpp +++ b/src/libs/utils/ssh/sshpacket.cpp @@ -37,7 +37,7 @@ #include "sshexception_p.h" #include "sshpacketparser_p.h" -#include <QtCore/QDebug> +#include <QDebug> #include <cctype> diff --git a/src/libs/utils/ssh/sshpacket_p.h b/src/libs/utils/ssh/sshpacket_p.h index 486ec6c39c..594f13c744 100644 --- a/src/libs/utils/ssh/sshpacket_p.h +++ b/src/libs/utils/ssh/sshpacket_p.h @@ -35,9 +35,9 @@ #include "sshexception_p.h" -#include <QtCore/QtEndian> -#include <QtCore/QByteArray> -#include <QtCore/QList> +#include <QtEndian> +#include <QByteArray> +#include <QList> #include <botan/bigint.h> diff --git a/src/libs/utils/ssh/sshpacketparser_p.h b/src/libs/utils/ssh/sshpacketparser_p.h index c811ef4b9d..a1e0e7eab9 100644 --- a/src/libs/utils/ssh/sshpacketparser_p.h +++ b/src/libs/utils/ssh/sshpacketparser_p.h @@ -35,9 +35,9 @@ #include <botan/bigint.h> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QByteArray> +#include <QList> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshpseudoterminal.h b/src/libs/utils/ssh/sshpseudoterminal.h index 679ef6986f..263bcd574d 100644 --- a/src/libs/utils/ssh/sshpseudoterminal.h +++ b/src/libs/utils/ssh/sshpseudoterminal.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QByteArray> -#include <QtCore/QHash> +#include <QByteArray> +#include <QHash> namespace Utils { diff --git a/src/libs/utils/ssh/sshremoteprocess.cpp b/src/libs/utils/ssh/sshremoteprocess.cpp index 0368026019..813e1f824c 100644 --- a/src/libs/utils/ssh/sshremoteprocess.cpp +++ b/src/libs/utils/ssh/sshremoteprocess.cpp @@ -40,7 +40,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QTimer> +#include <QTimer> #include <cstring> #include <cstdlib> diff --git a/src/libs/utils/ssh/sshremoteprocess.h b/src/libs/utils/ssh/sshremoteprocess.h index db73596b0a..ed4e96e5d7 100644 --- a/src/libs/utils/ssh/sshremoteprocess.h +++ b/src/libs/utils/ssh/sshremoteprocess.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QProcess> -#include <QtCore/QSharedPointer> +#include <QProcess> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QByteArray; diff --git a/src/libs/utils/ssh/sshremoteprocess_p.h b/src/libs/utils/ssh/sshremoteprocess_p.h index d44d0c70c3..eba60a6ac1 100644 --- a/src/libs/utils/ssh/sshremoteprocess_p.h +++ b/src/libs/utils/ssh/sshremoteprocess_p.h @@ -37,9 +37,9 @@ #include "sshchannel_p.h" -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QProcess> +#include <QList> +#include <QPair> +#include <QProcess> namespace Utils { class SshRemoteProcess; diff --git a/src/libs/utils/ssh/sshsendfacility.cpp b/src/libs/utils/ssh/sshsendfacility.cpp index f58cf4e23f..771d145405 100644 --- a/src/libs/utils/ssh/sshsendfacility.cpp +++ b/src/libs/utils/ssh/sshsendfacility.cpp @@ -35,7 +35,7 @@ #include "sshkeyexchange_p.h" #include "sshoutgoingpacket_p.h" -#include <QtNetwork/QTcpSocket> +#include <QTcpSocket> namespace Utils { namespace Internal { diff --git a/src/libs/utils/statuslabel.cpp b/src/libs/utils/statuslabel.cpp index 086998477c..c1c198bd40 100644 --- a/src/libs/utils/statuslabel.cpp +++ b/src/libs/utils/statuslabel.cpp @@ -32,7 +32,7 @@ #include "statuslabel.h" -#include <QtCore/QTimer> +#include <QTimer> /*! \class Utils::StatusLabel diff --git a/src/libs/utils/statuslabel.h b/src/libs/utils/statuslabel.h index 85b9a43fd2..babd403b9f 100644 --- a/src/libs/utils/statuslabel.h +++ b/src/libs/utils/statuslabel.h @@ -37,7 +37,7 @@ QT_FORWARD_DECLARE_CLASS(QTimer) -#include <QtGui/QLabel> +#include <QLabel> namespace Utils { diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index cc7a347874..b284b7fc26 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -32,10 +32,10 @@ #include "stringutils.h" -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> +#include <QString> +#include <QStringList> +#include <QFileInfo> +#include <QDir> #include <limits.h> diff --git a/src/libs/utils/styledbar.cpp b/src/libs/utils/styledbar.cpp index 461949e627..267bcb559f 100644 --- a/src/libs/utils/styledbar.cpp +++ b/src/libs/utils/styledbar.cpp @@ -34,11 +34,11 @@ #include "stylehelper.h" -#include <QtCore/QVariant> -#include <QtGui/QPainter> -#include <QtGui/QPixmapCache> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> +#include <QVariant> +#include <QPainter> +#include <QPixmapCache> +#include <QStyle> +#include <QStyleOption> using namespace Utils; diff --git a/src/libs/utils/styledbar.h b/src/libs/utils/styledbar.h index b56b834e26..a1abcffb7a 100644 --- a/src/libs/utils/styledbar.h +++ b/src/libs/utils/styledbar.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace Utils { diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index d22fcb4382..0e2cbb9d2b 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -32,14 +32,14 @@ #include "stylehelper.h" -#include <QtGui/QPixmapCache> -#include <QtGui/QWidget> -#include <QtCore/QRect> -#include <QtGui/QPainter> -#include <QtGui/QApplication> -#include <QtGui/QPalette> -#include <QtGui/QStyleOption> -#include <QtCore/QObject> +#include <QPixmapCache> +#include <QWidget> +#include <QRect> +#include <QPainter> +#include <QApplication> +#include <QPalette> +#include <QStyleOption> +#include <QObject> // Clamps float color values within (0, 255) static int clamp(float x) diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h index b7928016f0..1902c1c49d 100644 --- a/src/libs/utils/stylehelper.h +++ b/src/libs/utils/stylehelper.h @@ -35,8 +35,8 @@ #include "utils_global.h" -#include <QtGui/QColor> -#include <QtGui/QStyle> +#include <QColor> +#include <QStyle> QT_BEGIN_NAMESPACE class QPalette; diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp index fd36dcc943..e2649941ae 100644 --- a/src/libs/utils/submiteditorwidget.cpp +++ b/src/libs/utils/submiteditorwidget.cpp @@ -34,17 +34,17 @@ #include "submitfieldwidget.h" #include "ui_submiteditorwidget.h" -#include <QtCore/QDebug> -#include <QtCore/QPointer> -#include <QtCore/QTimer> -#include <QtCore/QScopedPointer> - -#include <QtGui/QPushButton> -#include <QtGui/QMenu> -#include <QtGui/QHBoxLayout> -#include <QtGui/QToolButton> -#include <QtGui/QSpacerItem> -#include <QtGui/QShortcut> +#include <QDebug> +#include <QPointer> +#include <QTimer> +#include <QScopedPointer> + +#include <QPushButton> +#include <QMenu> +#include <QHBoxLayout> +#include <QToolButton> +#include <QSpacerItem> +#include <QShortcut> enum { debug = 0 }; enum { defaultLineWidth = 72 }; diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h index b724211e8a..999bb71726 100644 --- a/src/libs/utils/submiteditorwidget.h +++ b/src/libs/utils/submiteditorwidget.h @@ -36,8 +36,8 @@ #include "utils_global.h" #include "completingtextedit.h" -#include <QtGui/QWidget> -#include <QtGui/QAbstractItemView> +#include <QWidget> +#include <QAbstractItemView> QT_BEGIN_NAMESPACE class QListWidgetItem; diff --git a/src/libs/utils/submitfieldwidget.cpp b/src/libs/utils/submitfieldwidget.cpp index f2d9d111f3..4d7b173810 100644 --- a/src/libs/utils/submitfieldwidget.cpp +++ b/src/libs/utils/submitfieldwidget.cpp @@ -32,17 +32,17 @@ #include "submitfieldwidget.h" -#include <QtGui/QComboBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QToolButton> -#include <QtGui/QCompleter> -#include <QtGui/QIcon> -#include <QtGui/QToolBar> - -#include <QtCore/QList> -#include <QtCore/QDebug> +#include <QComboBox> +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QLineEdit> +#include <QToolButton> +#include <QCompleter> +#include <QIcon> +#include <QToolBar> + +#include <QList> +#include <QDebug> enum { debug = 0 }; enum { spacing = 2 }; diff --git a/src/libs/utils/submitfieldwidget.h b/src/libs/utils/submitfieldwidget.h index 31f531839e..c74863e550 100644 --- a/src/libs/utils/submitfieldwidget.h +++ b/src/libs/utils/submitfieldwidget.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QCompleter; diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 6f9f81ab0a..2a9790d9bd 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -33,15 +33,15 @@ #include "synchronousprocess.h" #include <qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtCore/QEventLoop> -#include <QtCore/QTextCodec> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QMessageBox> - -#include <QtGui/QApplication> +#include <QDebug> +#include <QTimer> +#include <QEventLoop> +#include <QTextCodec> +#include <QFileInfo> +#include <QDir> +#include <QMessageBox> + +#include <QApplication> #include <limits.h> diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h index 726f488d51..436bcccce1 100644 --- a/src/libs/utils/synchronousprocess.h +++ b/src/libs/utils/synchronousprocess.h @@ -35,10 +35,10 @@ #include "utils_global.h" -#include <QtCore/QObject> -#include <QtCore/QProcess> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QProcess> +#include <QStringList> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QTextCodec; diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp index 2be5938702..ec592ead18 100644 --- a/src/libs/utils/textfileformat.cpp +++ b/src/libs/utils/textfileformat.cpp @@ -34,10 +34,10 @@ #include "fileutils.h" #include "qtcassert.h" -#include <QtCore/QTextCodec> -#include <QtCore/QStringList> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> +#include <QTextCodec> +#include <QStringList> +#include <QCoreApplication> +#include <QDebug> enum { debug = 0 }; diff --git a/src/libs/utils/textfileformat.h b/src/libs/utils/textfileformat.h index 967f17f4e5..d33fa309c9 100644 --- a/src/libs/utils/textfileformat.h +++ b/src/libs/utils/textfileformat.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QTextCodec; diff --git a/src/libs/utils/treewidgetcolumnstretcher.cpp b/src/libs/utils/treewidgetcolumnstretcher.cpp index 9819543503..87a5118cd4 100644 --- a/src/libs/utils/treewidgetcolumnstretcher.cpp +++ b/src/libs/utils/treewidgetcolumnstretcher.cpp @@ -31,9 +31,9 @@ **************************************************************************/ #include "treewidgetcolumnstretcher.h" -#include <QtGui/QTreeWidget> -#include <QtGui/QHideEvent> -#include <QtGui/QHeaderView> +#include <QTreeWidget> +#include <QHideEvent> +#include <QHeaderView> using namespace Utils; diff --git a/src/libs/utils/treewidgetcolumnstretcher.h b/src/libs/utils/treewidgetcolumnstretcher.h index 9cd10cca86..47b1eb364a 100644 --- a/src/libs/utils/treewidgetcolumnstretcher.h +++ b/src/libs/utils/treewidgetcolumnstretcher.h @@ -34,7 +34,7 @@ #define TREEWIDGETCOLUMNSTRETCHER_H #include "utils_global.h" -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QTreeWidget; diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp index 3a0f425e21..d3992aad6b 100644 --- a/src/libs/utils/uncommentselection.cpp +++ b/src/libs/utils/uncommentselection.cpp @@ -31,11 +31,11 @@ **************************************************************************/ #include "uncommentselection.h" -#include <QtCore/QtGlobal> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> -#include <QtGui/QTextDocument> +#include <QtGlobal> +#include <QPlainTextEdit> +#include <QTextCursor> +#include <QTextBlock> +#include <QTextDocument> using namespace Utils; diff --git a/src/libs/utils/uncommentselection.h b/src/libs/utils/uncommentselection.h index d7fba7be5c..e1a4136e93 100644 --- a/src/libs/utils/uncommentselection.h +++ b/src/libs/utils/uncommentselection.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QPlainTextEdit; diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp index a9e62e434e..67649c63fa 100644 --- a/src/libs/utils/unixutils.cpp +++ b/src/libs/utils/unixutils.cpp @@ -32,10 +32,10 @@ #include "unixutils.h" -#include <QtCore/QSettings> -#include <QtCore/QObject> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> +#include <QSettings> +#include <QObject> +#include <QFileInfo> +#include <QCoreApplication> using namespace Utils; diff --git a/src/libs/utils/unixutils.h b/src/libs/utils/unixutils.h index ac5ad185f9..efd92478f4 100644 --- a/src/libs/utils/unixutils.h +++ b/src/libs/utils/unixutils.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h index cc20359f0a..7cfbbd1a92 100644 --- a/src/libs/utils/utils_global.h +++ b/src/libs/utils/utils_global.h @@ -33,7 +33,7 @@ #ifndef UTILS_GLOBAL_H #define UTILS_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(QTCREATOR_UTILS_LIB) # define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp index 0473de9f88..94e7491e20 100644 --- a/src/libs/utils/winutils.cpp +++ b/src/libs/utils/winutils.cpp @@ -37,12 +37,12 @@ #define _WIN32_WINNT 0x0501 #include <windows.h> -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtCore/QDebug> -#include <QtCore/QLibrary> -#include <QtCore/QTextStream> -#include <QtCore/QDir> +#include <QString> +#include <QVector> +#include <QDebug> +#include <QLibrary> +#include <QTextStream> +#include <QDir> namespace Utils { diff --git a/src/libs/utils/winutils.h b/src/libs/utils/winutils.h index 0c60c32966..a94e090025 100644 --- a/src/libs/utils/winutils.h +++ b/src/libs/utils/winutils.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtCore/QProcess> // Q_PID (is PROCESS_INFORMATION*) +#include <QProcess> // Q_PID (is PROCESS_INFORMATION*) QT_BEGIN_NAMESPACE class QString; diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index f77a48bdf1..75b5fb6c1e 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -32,14 +32,14 @@ #include "wizard.h" -#include <QtCore/QMap> -#include <QtCore/QHash> -#include <QtCore/QVariant> - -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QStyle> +#include <QMap> +#include <QHash> +#include <QVariant> + +#include <QLabel> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QStyle> /*! \class Utils::Wizard diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h index 26d259686c..1ea793a239 100644 --- a/src/libs/utils/wizard.h +++ b/src/libs/utils/wizard.h @@ -35,7 +35,7 @@ #include "utils_global.h" -#include <QtGui/QWizard> +#include <QWizard> namespace Utils { diff --git a/src/libs/zeroconf/dnsSdLib.cpp b/src/libs/zeroconf/dnsSdLib.cpp index 9db26d6cf4..603e291740 100644 --- a/src/libs/zeroconf/dnsSdLib.cpp +++ b/src/libs/zeroconf/dnsSdLib.cpp @@ -35,11 +35,11 @@ #include "servicebrowser.h" #include "servicebrowser_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QLibrary> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QCoreApplication> +#include <QDebug> +#include <QLibrary> +#include <QString> +#include <QStringList> #include <errno.h> diff --git a/src/libs/zeroconf/embeddedLib.cpp b/src/libs/zeroconf/embeddedLib.cpp index 6dc5ad508d..8ce4be55df 100644 --- a/src/libs/zeroconf/embeddedLib.cpp +++ b/src/libs/zeroconf/embeddedLib.cpp @@ -34,11 +34,11 @@ #include "servicebrowser_p.h" -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QProcess> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> +#include <QString> +#include <QStringList> +#include <QProcess> +#include <QCoreApplication> +#include <QDebug> #ifdef Q_OS_LINUX #define EMBEDDED_LIB diff --git a/src/libs/zeroconf/servicebrowser.cpp b/src/libs/zeroconf/servicebrowser.cpp index 70d74f7416..a80356637d 100644 --- a/src/libs/zeroconf/servicebrowser.cpp +++ b/src/libs/zeroconf/servicebrowser.cpp @@ -46,16 +46,16 @@ #include <errno.h> #include <limits> -#include <QtCore/QAtomicPointer> -#include <QtCore/QCoreApplication> -#include <QtCore/QDateTime> -#include <QtCore/QGlobalStatic> -#include <QtCore/QMetaType> -#include <QtCore/QMutexLocker> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QtEndian> -#include <QtNetwork/QHostInfo> +#include <QAtomicPointer> +#include <QCoreApplication> +#include <QDateTime> +#include <QGlobalStatic> +#include <QMetaType> +#include <QMutexLocker> +#include <QString> +#include <QStringList> +#include <QtEndian> +#include <QHostInfo> //the timeval struct under windows uses long instead of suseconds_t #ifdef Q_OS_WIN diff --git a/src/libs/zeroconf/servicebrowser.h b/src/libs/zeroconf/servicebrowser.h index f637194773..88f01ab4b2 100644 --- a/src/libs/zeroconf/servicebrowser.h +++ b/src/libs/zeroconf/servicebrowser.h @@ -35,10 +35,10 @@ #include "zeroconf_global.h" -#include <QtCore/QHash> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QStringList> +#include <QHash> +#include <QObject> +#include <QSharedPointer> +#include <QStringList> QT_FORWARD_DECLARE_CLASS(QHostInfo) diff --git a/src/libs/zeroconf/servicebrowser_p.h b/src/libs/zeroconf/servicebrowser_p.h index c2867fa189..8cd880d18a 100644 --- a/src/libs/zeroconf/servicebrowser_p.h +++ b/src/libs/zeroconf/servicebrowser_p.h @@ -36,15 +36,15 @@ #include "dns_sd_types.h" #include "servicebrowser.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QAtomicInt> -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QMutex> -#include <QtCore/QSharedPointer> -#include <QtCore/QStringList> -#include <QtCore/QThread> +#include <QCoreApplication> +#include <QAtomicInt> +#include <QHash> +#include <QList> +#include <QMap> +#include <QMutex> +#include <QSharedPointer> +#include <QStringList> +#include <QThread> class QHostInfo; diff --git a/src/libs/zeroconf/zeroconf_global.h b/src/libs/zeroconf/zeroconf_global.h index 76341da395..7e0b7c251d 100644 --- a/src/libs/zeroconf/zeroconf_global.h +++ b/src/libs/zeroconf/zeroconf_global.h @@ -33,7 +33,7 @@ #ifndef ZEROCONF_GLOBAL_H #define ZEROCONF_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(ZEROCONF_LIBRARY) # define ZEROCONFSHARED_EXPORT Q_DECL_EXPORT |