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 | |
| parent | 9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff) | |
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')
2200 files changed, 7487 insertions, 7488 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 3292fef039..612aadd055 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -38,24 +38,24 @@ #include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginspec.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QLibraryInfo> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtCore/QThreadPool> -#include <QtCore/QTimer> -#include <QtCore/QTranslator> -#include <QtCore/QUrl> -#include <QtCore/QVariant> - -#include <QtNetwork/QNetworkProxyFactory> - -#include <QtGui/QApplication> -#include <QtGui/QDesktopServices> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QLibraryInfo> +#include <QSettings> +#include <QTextStream> +#include <QThreadPool> +#include <QTimer> +#include <QTranslator> +#include <QUrl> +#include <QVariant> + +#include <QNetworkProxyFactory> + +#include <QApplication> +#include <QDesktopServices> +#include <QMainWindow> +#include <QMessageBox> #ifdef ENABLE_QT_BREAKPAD #include <qtsystemexceptionhandler.h> 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 diff --git a/src/plugins/analyzerbase/analyzerbase_global.h b/src/plugins/analyzerbase/analyzerbase_global.h index 4525be9968..983eb7034e 100644 --- a/src/plugins/analyzerbase/analyzerbase_global.h +++ b/src/plugins/analyzerbase/analyzerbase_global.h @@ -35,7 +35,7 @@ #ifndef ANALYZERBASE_GLOBAL_H #define ANALYZERBASE_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(ANALYZER_LIBRARY) # define ANALYZER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/analyzerbase/analyzerconstants.h b/src/plugins/analyzerbase/analyzerconstants.h index 8bbe08c4d3..afa7d2b392 100644 --- a/src/plugins/analyzerbase/analyzerconstants.h +++ b/src/plugins/analyzerbase/analyzerconstants.h @@ -35,7 +35,7 @@ #ifndef ANALYZERCONSTANTS_H #define ANALYZERCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Analyzer { diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 38daa8034e..c2747407af 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -76,24 +76,24 @@ #include <utils/statuslabel.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QVariant> -#include <QtCore/QDebug> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDockWidget> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QMenuBar> -#include <QtGui/QToolButton> -#include <QtGui/QComboBox> -#include <QtGui/QStackedWidget> -#include <QtGui/QDialog> -#include <QtGui/QApplication> -#include <QtGui/QLabel> -#include <QtGui/QCheckBox> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QMainWindow> -#include <QtGui/QPushButton> +#include <QVariant> +#include <QDebug> +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QDockWidget> +#include <QAction> +#include <QMenu> +#include <QMenuBar> +#include <QToolButton> +#include <QComboBox> +#include <QStackedWidget> +#include <QDialog> +#include <QApplication> +#include <QLabel> +#include <QCheckBox> +#include <QDialogButtonBox> +#include <QMainWindow> +#include <QPushButton> using namespace Core; using namespace Core::Constants; diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h index f1df49b0d0..f2fbecfbc7 100644 --- a/src/plugins/analyzerbase/analyzermanager.h +++ b/src/plugins/analyzerbase/analyzermanager.h @@ -40,7 +40,7 @@ #include <coreplugin/id.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QDockWidget; diff --git a/src/plugins/analyzerbase/analyzeroptionspage.cpp b/src/plugins/analyzerbase/analyzeroptionspage.cpp index 0b90546f43..50bdcb45d7 100644 --- a/src/plugins/analyzerbase/analyzeroptionspage.cpp +++ b/src/plugins/analyzerbase/analyzeroptionspage.cpp @@ -39,12 +39,12 @@ #include <coreplugin/icore.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QLatin1String> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QLatin1String> +#include <QDebug> -#include <QtGui/QIcon> -#include <QtGui/QWidget> +#include <QIcon> +#include <QWidget> using namespace Analyzer; using namespace Analyzer::Internal; diff --git a/src/plugins/analyzerbase/analyzerplugin.cpp b/src/plugins/analyzerbase/analyzerplugin.cpp index 0e0d28f25d..a8a3367c3e 100644 --- a/src/plugins/analyzerbase/analyzerplugin.cpp +++ b/src/plugins/analyzerbase/analyzerplugin.cpp @@ -47,10 +47,10 @@ #include <projectexplorer/task.h> #include <projectexplorer/taskhub.h> -#include <QtCore/QtPlugin> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QApplication> +#include <QtPlugin> +#include <QMessageBox> +#include <QMainWindow> +#include <QApplication> using namespace Analyzer; using namespace Analyzer::Internal; diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp index e57953484e..16b5721056 100644 --- a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp +++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp @@ -36,12 +36,12 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtGui/QApplication> -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QComboBox> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QApplication> +#include <QLabel> +#include <QVBoxLayout> +#include <QComboBox> +#include <QPushButton> namespace Analyzer { namespace Internal { diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp index 9e5309b78b..bda27e8fbf 100644 --- a/src/plugins/analyzerbase/analyzerruncontrol.cpp +++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp @@ -46,7 +46,7 @@ #include <projectexplorer/taskhub.h> #include <coreplugin/ioutputpane.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace ProjectExplorer; diff --git a/src/plugins/analyzerbase/analyzersettings.cpp b/src/plugins/analyzerbase/analyzersettings.cpp index fe75385cf9..5be75f4767 100644 --- a/src/plugins/analyzerbase/analyzersettings.cpp +++ b/src/plugins/analyzerbase/analyzersettings.cpp @@ -42,7 +42,7 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QSettings> +#include <QSettings> using namespace Analyzer::Internal; diff --git a/src/plugins/analyzerbase/analyzersettings.h b/src/plugins/analyzerbase/analyzersettings.h index ca9e607c29..37a84980d8 100644 --- a/src/plugins/analyzerbase/analyzersettings.h +++ b/src/plugins/analyzerbase/analyzersettings.h @@ -35,8 +35,8 @@ #ifndef ANALYZER_INTERNAL_ANALYZERSETTINGS_H #define ANALYZER_INTERNAL_ANALYZERSETTINGS_H -#include <QtCore/QObject> -#include <QtCore/QVariant> +#include <QObject> +#include <QVariant> #include "analyzerbase_global.h" diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/analyzerbase/analyzerstartparameters.h index 20e4ea0a4e..651e05d7ce 100644 --- a/src/plugins/analyzerbase/analyzerstartparameters.h +++ b/src/plugins/analyzerbase/analyzerstartparameters.h @@ -36,7 +36,7 @@ #include "analyzerbase_global.h" #include "analyzerconstants.h" -#include <QtCore/QMetaType> +#include <QMetaType> #include <coreplugin/id.h> #include <utils/ssh/sshconnection.h> diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/analyzerbase/analyzerutils.cpp index 44324e3b4f..2465742863 100644 --- a/src/plugins/analyzerbase/analyzerutils.cpp +++ b/src/plugins/analyzerbase/analyzerutils.cpp @@ -49,9 +49,9 @@ #include <Scope.h> #include <Symbol.h> -#include <QtGui/QTextDocumentFragment> -#include <QtGui/QTextCursor> -#include <QtGui/QWidget> +#include <QTextDocumentFragment> +#include <QTextCursor> +#include <QWidget> using namespace Analyzer; using namespace Core; diff --git a/src/plugins/analyzerbase/ianalyzerengine.h b/src/plugins/analyzerbase/ianalyzerengine.h index 77a382a2e4..b895007161 100644 --- a/src/plugins/analyzerbase/ianalyzerengine.h +++ b/src/plugins/analyzerbase/ianalyzerengine.h @@ -41,8 +41,8 @@ #include <projectexplorer/task.h> #include <utils/outputformat.h> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> namespace ProjectExplorer { class RunConfiguration; diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/analyzerbase/ianalyzertool.h index d24e3909b7..3ecd06599f 100644 --- a/src/plugins/analyzerbase/ianalyzertool.h +++ b/src/plugins/analyzerbase/ianalyzertool.h @@ -42,7 +42,7 @@ #include <coreplugin/id.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QObject> +#include <QObject> namespace ProjectExplorer { class RunConfiguration; diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/analyzerbase/startremotedialog.cpp index 3ff002657d..2e541bb53c 100644 --- a/src/plugins/analyzerbase/startremotedialog.cpp +++ b/src/plugins/analyzerbase/startremotedialog.cpp @@ -37,7 +37,7 @@ #include <coreplugin/icore.h> #include <utils/ssh/sshconnection.h> -#include <QtGui/QPushButton> +#include <QPushButton> namespace Analyzer { diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/analyzerbase/startremotedialog.h index 52ba5d3d2e..8e74fafb1e 100644 --- a/src/plugins/analyzerbase/startremotedialog.h +++ b/src/plugins/analyzerbase/startremotedialog.h @@ -35,7 +35,7 @@ #include "analyzerbase_global.h" -#include <QtGui/QDialog> +#include <QDialog> namespace Utils { class SshConnectionParameters; } diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index f85ab38904..e6d1b93b57 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp @@ -45,10 +45,10 @@ #include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcprocess.h> -#include <QtCore/QVariantMap> -#include <QtCore/QDateTime> -#include <QtGui/QLineEdit> -#include <QtGui/QFormLayout> +#include <QVariantMap> +#include <QDateTime> +#include <QLineEdit> +#include <QFormLayout> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp index f7e7526bf8..09d7d3cc2a 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp @@ -45,9 +45,9 @@ #include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcprocess.h> -#include <QtCore/QVariantMap> -#include <QtGui/QLineEdit> -#include <QtGui/QFormLayout> +#include <QVariantMap> +#include <QLineEdit> +#include <QFormLayout> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index b6b74416c8..5dd9d1ca96 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -47,7 +47,7 @@ #include <projectexplorer/customexecutablerunconfiguration.h> #include <utils/qtcassert.h> -#include <QtGui/QInputDialog> +#include <QInputDialog> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Constants; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp index 44735a624a..72ed2dc159 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp @@ -39,12 +39,12 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/toolchainmanager.h> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QFormLayout> -#include <QtGui/QComboBox> -#include <QtCore/QPointer> +#include <QGridLayout> +#include <QLabel> +#include <QLineEdit> +#include <QFormLayout> +#include <QComboBox> +#include <QPointer> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp index 13a85d2f52..9fd234d753 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp @@ -34,10 +34,10 @@ #include "autotoolsopenprojectwizard.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QLabel> -#include <QtCore/QDir> +#include <QVBoxLayout> +#include <QFormLayout> +#include <QLabel> +#include <QDir> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index 656ca52fd8..015a303001 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -52,14 +52,14 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> -#include <QtCore/QPointer> -#include <QtGui/QApplication> -#include <QtGui/QCursor> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QVBoxLayout> +#include <QFileInfo> +#include <QTimer> +#include <QPointer> +#include <QApplication> +#include <QCursor> +#include <QLabel> +#include <QPushButton> +#include <QVBoxLayout> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index e495eeb968..0ec30b4d91 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -44,8 +44,8 @@ #include <projectexplorer/projectnodes.h> #include <utils/filesystemwatcher.h> -#include <QtCore/QPointer> -#include <QtCore/QDir> +#include <QPointer> +#include <QDir> namespace ProjectExplorer { class ToolChain; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp index 663aae7992..d16a9cdd74 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp @@ -45,8 +45,8 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> -#include <QtCore/QStringList> -#include <QtCore/QtPlugin> +#include <QStringList> +#include <QtPlugin> using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/autotoolstarget.cpp b/src/plugins/autotoolsprojectmanager/autotoolstarget.cpp index 5c540f2291..3cb86856bf 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolstarget.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolstarget.cpp @@ -47,8 +47,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <extensionsystem/pluginmanager.h> -#include <QtGui/QApplication> -#include <QtGui/QStyle> +#include <QApplication> +#include <QStyle> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index 6506755e8a..1fce702ca8 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp @@ -45,10 +45,10 @@ #include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcprocess.h> -#include <QtCore/QVariantMap> -#include <QtCore/QDateTime> -#include <QtGui/QLineEdit> -#include <QtGui/QFormLayout> +#include <QVariantMap> +#include <QDateTime> +#include <QLineEdit> +#include <QFormLayout> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp index c86f402b6c..0bee440343 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp @@ -36,9 +36,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfoList> -#include <QtCore/QMutexLocker> +#include <QFile> +#include <QFileInfoList> +#include <QMutexLocker> using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.h b/src/plugins/autotoolsprojectmanager/makefileparser.h index ca660b657b..d943453fec 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.h +++ b/src/plugins/autotoolsprojectmanager/makefileparser.h @@ -35,13 +35,13 @@ #ifndef MAKEFILEPARSER_H #define MAKEFILEPARSER_H -#include <QtCore/QMutex> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> -#include <QtCore/QObject> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QMutex> +#include <QString> +#include <QStringList> +#include <QTextStream> +#include <QObject> +#include <QDir> +#include <QFileInfo> namespace AutotoolsProjectManager { namespace Internal { diff --git a/src/plugins/autotoolsprojectmanager/makefileparserthread.cpp b/src/plugins/autotoolsprojectmanager/makefileparserthread.cpp index 3296ebe06c..2de743918c 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparserthread.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparserthread.cpp @@ -34,7 +34,7 @@ #include "makefileparserthread.h" -#include <QtCore/QMutexLocker> +#include <QMutexLocker> using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/autotoolsprojectmanager/makefileparserthread.h b/src/plugins/autotoolsprojectmanager/makefileparserthread.h index a8f03b8e10..e998c726cc 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparserthread.h +++ b/src/plugins/autotoolsprojectmanager/makefileparserthread.h @@ -37,9 +37,9 @@ #include "makefileparser.h" -#include <QtCore/QMutex> -#include <QtCore/QString> -#include <QtCore/QThread> +#include <QMutex> +#include <QString> +#include <QThread> namespace AutotoolsProjectManager { namespace Internal { diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index 64255f430e..57c3ef834a 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -45,9 +45,9 @@ #include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcprocess.h> -#include <QtCore/QVariantMap> -#include <QtGui/QLineEdit> -#include <QtGui/QFormLayout> +#include <QVariantMap> +#include <QLineEdit> +#include <QFormLayout> using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h index ddae833556..bea25e8a56 100644 --- a/src/plugins/bazaar/annotationhighlighter.h +++ b/src/plugins/bazaar/annotationhighlighter.h @@ -34,7 +34,7 @@ #define ANNOTATIONHIGHLIGHTER_H #include <vcsbase/baseannotationhighlighter.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp index 96fea24540..d148d07623 100644 --- a/src/plugins/bazaar/bazaarclient.cpp +++ b/src/plugins/bazaar/bazaarclient.cpp @@ -40,10 +40,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtCore/QtDebug> +#include <QDir> +#include <QFileInfo> +#include <QTextStream> +#include <QtDebug> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp index 805e4e028c..f419b587db 100644 --- a/src/plugins/bazaar/bazaarcommitwidget.cpp +++ b/src/plugins/bazaar/bazaarcommitwidget.cpp @@ -38,11 +38,11 @@ #include <texteditor/texteditorconstants.h> #include <utils/qtcassert.h> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextEdit> +#include <QSyntaxHighlighter> +#include <QTextEdit> -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QDebug> +#include <QRegExp> //see the git submit widget for details of the syntax Highlighter diff --git a/src/plugins/bazaar/bazaarcontrol.cpp b/src/plugins/bazaar/bazaarcontrol.cpp index c853a76d2d..a348a6c611 100644 --- a/src/plugins/bazaar/bazaarcontrol.cpp +++ b/src/plugins/bazaar/bazaarcontrol.cpp @@ -36,10 +36,10 @@ #include <vcsbase/vcsbaseclientsettings.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QFileInfo> -#include <QtCore/QVariant> -#include <QtCore/QStringList> -#include <QtCore/QDir> +#include <QFileInfo> +#include <QVariant> +#include <QStringList> +#include <QDir> using namespace Bazaar::Internal; diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp index b0b7917ec3..414a43de7f 100644 --- a/src/plugins/bazaar/bazaareditor.cpp +++ b/src/plugins/bazaar/bazaareditor.cpp @@ -40,13 +40,13 @@ #include <utils/qtcassert.h> #include <vcsbase/diffhighlighter.h> -#include <QtCore/QRegExp> -#include <QtCore/QString> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QRegExp> +#include <QString> +#include <QTextCursor> +#include <QTextBlock> +#include <QDir> +#include <QFileInfo> +#include <QDebug> #define BZR_CHANGE_PATTERN "[0-9]+" diff --git a/src/plugins/bazaar/bazaareditor.h b/src/plugins/bazaar/bazaareditor.h index 333ab59d09..3c80e2402b 100644 --- a/src/plugins/bazaar/bazaareditor.h +++ b/src/plugins/bazaar/bazaareditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 8d259d3598..248ef882bc 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -64,16 +64,16 @@ #include <vcsbase/vcsbaseeditor.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QMainWindow> -#include <QtCore/QtDebug> -#include <QtCore/QtGlobal> -#include <QtCore/QDir> -#include <QtGui/QDialog> -#include <QtGui/QFileDialog> -#include <QtCore/QTemporaryFile> +#include <QtPlugin> +#include <QAction> +#include <QMenu> +#include <QMainWindow> +#include <QtDebug> +#include <QtGlobal> +#include <QDir> +#include <QDialog> +#include <QFileDialog> +#include <QTemporaryFile> using namespace Bazaar::Internal; diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h index e22588d1bd..dff7611977 100644 --- a/src/plugins/bazaar/bazaarplugin.h +++ b/src/plugins/bazaar/bazaarplugin.h @@ -40,9 +40,9 @@ #include <vcsbase/vcsbaseplugin.h> #include <coreplugin/icontext.h> -#include <QtCore/QFileInfo> -#include <QtCore/QHash> -#include <QtCore/qglobal.h> +#include <QFileInfo> +#include <QHash> +#include <qglobal.h> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp index 0c6d79086b..3ef1d0a989 100644 --- a/src/plugins/bazaar/bazaarsettings.cpp +++ b/src/plugins/bazaar/bazaarsettings.cpp @@ -33,7 +33,7 @@ #include "bazaarsettings.h" #include "constants.h" -#include <QtCore/QSettings> +#include <QSettings> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/branchinfo.h b/src/plugins/bazaar/branchinfo.h index 0841ad6f5a..90b5fcbb3a 100644 --- a/src/plugins/bazaar/branchinfo.h +++ b/src/plugins/bazaar/branchinfo.h @@ -33,7 +33,7 @@ #ifndef BRANCHINFO_H #define BRANCHINFO_H -#include <QtCore/QString> +#include <QString> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/cloneoptionspanel.cpp b/src/plugins/bazaar/cloneoptionspanel.cpp index febcecd8ba..30258cab57 100644 --- a/src/plugins/bazaar/cloneoptionspanel.cpp +++ b/src/plugins/bazaar/cloneoptionspanel.cpp @@ -33,7 +33,7 @@ #include "cloneoptionspanel.h" #include "ui_cloneoptionspanel.h" -#include <QtCore/QtDebug> +#include <QtDebug> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/cloneoptionspanel.h b/src/plugins/bazaar/cloneoptionspanel.h index 440ac734c4..6a4345d516 100644 --- a/src/plugins/bazaar/cloneoptionspanel.h +++ b/src/plugins/bazaar/cloneoptionspanel.h @@ -33,7 +33,7 @@ #ifndef CLONEOPTIONSPANEL_H #define CLONEOPTIONSPANEL_H -#include <QtGui/QWidget> +#include <QWidget> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/clonewizard.cpp b/src/plugins/bazaar/clonewizard.cpp index d967f37e9f..711b5c37ce 100644 --- a/src/plugins/bazaar/clonewizard.cpp +++ b/src/plugins/bazaar/clonewizard.cpp @@ -42,7 +42,7 @@ #include <vcsbase/vcsbaseconstants.h> #include <vcsbase/vcsconfigurationpage.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace Bazaar::Internal; diff --git a/src/plugins/bazaar/clonewizard.h b/src/plugins/bazaar/clonewizard.h index 4e96b35d67..d9b7f6816b 100644 --- a/src/plugins/bazaar/clonewizard.h +++ b/src/plugins/bazaar/clonewizard.h @@ -35,7 +35,7 @@ #include <vcsbase/basecheckoutwizard.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/commiteditor.cpp b/src/plugins/bazaar/commiteditor.cpp index 63d876024f..64648174df 100644 --- a/src/plugins/bazaar/commiteditor.cpp +++ b/src/plugins/bazaar/commiteditor.cpp @@ -36,7 +36,7 @@ #include <vcsbase/submitfilemodel.h> -#include <QtCore/QDebug> +#include <QDebug> #include <QDir> //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED diff --git a/src/plugins/bazaar/optionspage.cpp b/src/plugins/bazaar/optionspage.cpp index 48515718bb..088116e562 100644 --- a/src/plugins/bazaar/optionspage.cpp +++ b/src/plugins/bazaar/optionspage.cpp @@ -39,7 +39,7 @@ #include <utils/pathchooser.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QTextStream> +#include <QTextStream> using namespace Bazaar::Internal; using namespace Bazaar; diff --git a/src/plugins/bazaar/optionspage.h b/src/plugins/bazaar/optionspage.h index 9523bcd8b3..be58d10e39 100644 --- a/src/plugins/bazaar/optionspage.h +++ b/src/plugins/bazaar/optionspage.h @@ -37,8 +37,8 @@ #include <vcsbase/vcsbaseoptionspage.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h index f0f0367469..b9ca693ec3 100644 --- a/src/plugins/bazaar/pullorpushdialog.h +++ b/src/plugins/bazaar/pullorpushdialog.h @@ -33,7 +33,7 @@ #ifndef PULLORPUSHDIALOG_H #define PULLORPUSHDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bineditor/bineditor.cpp b/src/plugins/bineditor/bineditor.cpp index 7343962260..46e3347577 100644 --- a/src/plugins/bineditor/bineditor.cpp +++ b/src/plugins/bineditor/bineditor.cpp @@ -38,23 +38,23 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QByteArrayMatcher> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QTemporaryFile> -#include <QtCore/QVariant> - -#include <QtGui/QApplication> -#include <QtGui/QAction> -#include <QtGui/QClipboard> -#include <QtGui/QFontMetrics> -#include <QtGui/QHelpEvent> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPainter> -#include <QtGui/QScrollBar> -#include <QtGui/QToolTip> -#include <QtGui/QWheelEvent> +#include <QByteArrayMatcher> +#include <QDebug> +#include <QFile> +#include <QTemporaryFile> +#include <QVariant> + +#include <QApplication> +#include <QAction> +#include <QClipboard> +#include <QFontMetrics> +#include <QHelpEvent> +#include <QMenu> +#include <QMessageBox> +#include <QPainter> +#include <QScrollBar> +#include <QToolTip> +#include <QWheelEvent> // QByteArray::toLower() is broken, it stops at the first \0 static void lower(QByteArray &ba) diff --git a/src/plugins/bineditor/bineditor.h b/src/plugins/bineditor/bineditor.h index 4828ace27e..f0ce8a9271 100644 --- a/src/plugins/bineditor/bineditor.h +++ b/src/plugins/bineditor/bineditor.h @@ -35,15 +35,15 @@ #include "markup.h" -#include <QtCore/QBasicTimer> -#include <QtCore/QMap> -#include <QtCore/QSet> -#include <QtCore/QStack> -#include <QtCore/QString> - -#include <QtGui/QAbstractScrollArea> -#include <QtGui/QTextDocument> -#include <QtGui/QTextFormat> +#include <QBasicTimer> +#include <QMap> +#include <QSet> +#include <QStack> +#include <QString> + +#include <QAbstractScrollArea> +#include <QTextDocument> +#include <QTextFormat> QT_FORWARD_DECLARE_CLASS(QMenu) QT_FORWARD_DECLARE_CLASS(QHelpEvent) diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index b646a0da99..89e0da4975 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -36,21 +36,21 @@ #include <coreplugin/icore.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QRegExp> -#include <QtCore/QVariant> - -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QRegExpValidator> -#include <QtGui/QToolBar> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QDebug> +#include <QRegExp> +#include <QVariant> + +#include <QMenu> +#include <QAction> +#include <QMainWindow> +#include <QMessageBox> +#include <QHBoxLayout> +#include <QLineEdit> +#include <QRegExpValidator> +#include <QToolBar> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/coreconstants.h> diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h index 179ec50028..02fdff35c4 100644 --- a/src/plugins/bineditor/bineditorplugin.h +++ b/src/plugins/bineditor/bineditorplugin.h @@ -37,10 +37,10 @@ #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/icontext.h> -#include <QtCore/QtPlugin> -#include <QtCore/QPointer> -#include <QtCore/QStringList> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QPointer> +#include <QStringList> +#include <QAction> namespace BINEditor { class BinEditor; diff --git a/src/plugins/bineditor/markup.h b/src/plugins/bineditor/markup.h index 8257a29d19..696c8d6d54 100644 --- a/src/plugins/bineditor/markup.h +++ b/src/plugins/bineditor/markup.h @@ -33,10 +33,10 @@ #ifndef MARKUP_H #define MARKUP_H -#include <QtGui/QColor> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QMetaType> +#include <QColor> +#include <QString> +#include <QList> +#include <QMetaType> namespace BINEditor { /*! diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp index 8b7e517a8f..71e2777202 100644 --- a/src/plugins/bookmarks/bookmark.cpp +++ b/src/plugins/bookmarks/bookmark.cpp @@ -33,8 +33,8 @@ #include "bookmark.h" #include "bookmarkmanager.h" -#include <QtCore/QDebug> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QTextBlock> using namespace Bookmarks::Internal; diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h index 069a92d758..729535c547 100644 --- a/src/plugins/bookmarks/bookmark.h +++ b/src/plugins/bookmarks/bookmark.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE class QTreeWidgetItem; QT_END_NAMESPACE -#include <QtCore/QFileInfo> +#include <QFileInfo> namespace Bookmarks { namespace Internal { diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 9d79309e74..f4961c6f1b 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -44,14 +44,14 @@ #include <texteditor/basetexteditor.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> - -#include <QtGui/QAction> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QMenu> -#include <QtGui/QPainter> +#include <QDebug> +#include <QDir> +#include <QFileInfo> + +#include <QAction> +#include <QContextMenuEvent> +#include <QMenu> +#include <QPainter> Q_DECLARE_METATYPE(Bookmarks::Internal::Bookmark*) diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index 86e49c5588..c772e8836f 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/src/plugins/bookmarks/bookmarkmanager.h @@ -38,12 +38,12 @@ #include <texteditor/itexteditor.h> -#include <QtCore/QAbstractItemModel> -#include <QtCore/QMultiMap> -#include <QtCore/QList> -#include <QtGui/QListView> -#include <QtGui/QPixmap> -#include <QtGui/QStyledItemDelegate> +#include <QAbstractItemModel> +#include <QMultiMap> +#include <QList> +#include <QListView> +#include <QPixmap> +#include <QStyledItemDelegate> namespace ProjectExplorer { class SessionManager; diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index ac50e58304..1fccae71aa 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -46,10 +46,10 @@ #include <texteditor/itexteditor.h> #include <texteditor/texteditorconstants.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> +#include <QtPlugin> +#include <QDebug> -#include <QtGui/QMenu> +#include <QMenu> using namespace Bookmarks::Constants; using namespace Bookmarks::Internal; diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h index 2050ce464b..2607ebcb21 100644 --- a/src/plugins/bookmarks/bookmarksplugin.h +++ b/src/plugins/bookmarks/bookmarksplugin.h @@ -35,8 +35,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> -#include <QtCore/QMultiMap> +#include <QObject> +#include <QMultiMap> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index 091eb2b6eb..51ef04c418 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -48,9 +48,9 @@ #include <coreplugin/editormanager/ieditor.h> #include <texteditor/itexteditor.h> -#include <QtCore/QThread> -#include <QtCore/QMutex> -#include <QtCore/QMutexLocker> +#include <QThread> +#include <QMutex> +#include <QMutexLocker> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewmanager.h b/src/plugins/classview/classviewmanager.h index 64c0b75fdf..10d72cf864 100644 --- a/src/plugins/classview/classviewmanager.h +++ b/src/plugins/classview/classviewmanager.h @@ -33,9 +33,9 @@ #ifndef CLASSVIEWMANAGER_H #define CLASSVIEWMANAGER_H -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtGui/QStandardItem> +#include <QObject> +#include <QSharedPointer> +#include <QStandardItem> #include <cplusplus/CppDocument.h> diff --git a/src/plugins/classview/classviewnavigationwidget.cpp b/src/plugins/classview/classviewnavigationwidget.cpp index 1faea1bbf9..d544cc9eb4 100644 --- a/src/plugins/classview/classviewnavigationwidget.cpp +++ b/src/plugins/classview/classviewnavigationwidget.cpp @@ -41,8 +41,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QPointer> +#include <QDebug> +#include <QPointer> enum { debug = false }; diff --git a/src/plugins/classview/classviewnavigationwidget.h b/src/plugins/classview/classviewnavigationwidget.h index 51f18fd75d..3692cfe7cb 100644 --- a/src/plugins/classview/classviewnavigationwidget.h +++ b/src/plugins/classview/classviewnavigationwidget.h @@ -33,12 +33,12 @@ #ifndef CLASSVIEWNAVIGATIONWIDGET_H #define CLASSVIEWNAVIGATIONWIDGET_H -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QList> +#include <QSharedPointer> -#include <QtGui/QStandardItem> -#include <QtGui/QToolButton> -#include <QtGui/QWidget> +#include <QStandardItem> +#include <QToolButton> +#include <QWidget> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewnavigationwidgetfactory.cpp b/src/plugins/classview/classviewnavigationwidgetfactory.cpp index aca61b8bfd..acad731b07 100644 --- a/src/plugins/classview/classviewnavigationwidgetfactory.cpp +++ b/src/plugins/classview/classviewnavigationwidgetfactory.cpp @@ -38,8 +38,8 @@ #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> -#include <QtGui/QKeySequence> -#include <QtCore/QSettings> +#include <QKeySequence> +#include <QSettings> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp index b4bd9a36bc..035b985ade 100644 --- a/src/plugins/classview/classviewparser.cpp +++ b/src/plugins/classview/classviewparser.cpp @@ -51,14 +51,14 @@ #include <coreplugin/ifile.h> #include <utils/qtcassert.h> -#include <QtGui/QStandardItem> -#include <QtCore/QDebug> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QTimer> -#include <QtCore/QReadWriteLock> -#include <QtCore/QReadLocker> -#include <QtCore/QWriteLocker> +#include <QStandardItem> +#include <QDebug> +#include <QHash> +#include <QSet> +#include <QTimer> +#include <QReadWriteLock> +#include <QReadLocker> +#include <QWriteLocker> enum { debug = false }; diff --git a/src/plugins/classview/classviewparser.h b/src/plugins/classview/classviewparser.h index acebc2382e..0706991860 100644 --- a/src/plugins/classview/classviewparser.h +++ b/src/plugins/classview/classviewparser.h @@ -33,7 +33,7 @@ #ifndef CLASSVIEWPARSER_H #define CLASSVIEWPARSER_H -#include <QtCore/QObject> +#include <QObject> #include "classviewparsertreeitem.h" @@ -45,9 +45,9 @@ #include <projectexplorer/projectnodes.h> #include <projectexplorer/project.h> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> -#include <QtGui/QStandardItem> +#include <QList> +#include <QSharedPointer> +#include <QStandardItem> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewparsertreeitem.cpp b/src/plugins/classview/classviewparsertreeitem.cpp index 9182a730ef..16fdb649b0 100644 --- a/src/plugins/classview/classviewparsertreeitem.cpp +++ b/src/plugins/classview/classviewparsertreeitem.cpp @@ -36,13 +36,13 @@ #include "classviewconstants.h" #include "classviewutils.h" -#include <QtCore/QHash> -#include <QtCore/QPair> -#include <QtGui/QIcon> -#include <QtGui/QStandardItem> -#include <QtCore/QMutex> +#include <QHash> +#include <QPair> +#include <QIcon> +#include <QStandardItem> +#include <QMutex> -#include <QtCore/QDebug> +#include <QDebug> enum { debug = true }; diff --git a/src/plugins/classview/classviewparsertreeitem.h b/src/plugins/classview/classviewparsertreeitem.h index 7d184df4ee..6e5c3d8d8b 100644 --- a/src/plugins/classview/classviewparsertreeitem.h +++ b/src/plugins/classview/classviewparsertreeitem.h @@ -36,7 +36,7 @@ #include "classviewsymbollocation.h" #include "classviewsymbolinformation.h" -#include <QtCore/QSharedPointer> +#include <QSharedPointer> QT_FORWARD_DECLARE_CLASS(QStandardItem) diff --git a/src/plugins/classview/classviewplugin.cpp b/src/plugins/classview/classviewplugin.cpp index 204d04be82..c7d2106c6d 100644 --- a/src/plugins/classview/classviewplugin.cpp +++ b/src/plugins/classview/classviewplugin.cpp @@ -34,7 +34,7 @@ #include "classviewmanager.h" #include "classviewnavigationwidgetfactory.h" -#include <QtCore/QtPlugin> +#include <QtPlugin> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewsymbolinformation.cpp b/src/plugins/classview/classviewsymbolinformation.cpp index 7588e116d5..f4b200312c 100644 --- a/src/plugins/classview/classviewsymbolinformation.cpp +++ b/src/plugins/classview/classviewsymbolinformation.cpp @@ -33,8 +33,8 @@ #include "classviewsymbolinformation.h" #include "classviewutils.h" -#include <QtCore/QPair> -#include <QtCore/QHash> +#include <QPair> +#include <QHash> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewsymbolinformation.h b/src/plugins/classview/classviewsymbolinformation.h index 270c4e87fc..4e1d10f078 100644 --- a/src/plugins/classview/classviewsymbolinformation.h +++ b/src/plugins/classview/classviewsymbolinformation.h @@ -33,8 +33,8 @@ #ifndef CLASSVIEWSYMBOLINFORMATION_H #define CLASSVIEWSYMBOLINFORMATION_H -#include <QtCore/QMetaType> -#include <QtCore/QString> +#include <QMetaType> +#include <QString> #include <limits.h> diff --git a/src/plugins/classview/classviewsymbollocation.cpp b/src/plugins/classview/classviewsymbollocation.cpp index 17cbf46211..eb27098a08 100644 --- a/src/plugins/classview/classviewsymbollocation.cpp +++ b/src/plugins/classview/classviewsymbollocation.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "classviewsymbollocation.h" -#include <QtCore/QPair> -#include <QtCore/QHash> +#include <QPair> +#include <QHash> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewsymbollocation.h b/src/plugins/classview/classviewsymbollocation.h index d49db4b341..f4c3bf44f5 100644 --- a/src/plugins/classview/classviewsymbollocation.h +++ b/src/plugins/classview/classviewsymbollocation.h @@ -33,8 +33,8 @@ #ifndef CLASSVIEWSYMBOLLOCATION_H #define CLASSVIEWSYMBOLLOCATION_H -#include <QtCore/QMetaType> -#include <QtCore/QString> +#include <QMetaType> +#include <QString> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewtreeitemmodel.h b/src/plugins/classview/classviewtreeitemmodel.h index e1efa755a5..8f7611275c 100644 --- a/src/plugins/classview/classviewtreeitemmodel.h +++ b/src/plugins/classview/classviewtreeitemmodel.h @@ -33,7 +33,7 @@ #ifndef CLASSVIEWTREEITEMMODEL_H #define CLASSVIEWTREEITEMMODEL_H -#include <QtGui/QStandardItemModel> +#include <QStandardItemModel> namespace ClassView { namespace Internal { diff --git a/src/plugins/classview/classviewutils.cpp b/src/plugins/classview/classviewutils.cpp index 609b4636c7..943d3a059f 100644 --- a/src/plugins/classview/classviewutils.cpp +++ b/src/plugins/classview/classviewutils.cpp @@ -37,8 +37,8 @@ // needed for the correct sorting order #include <cplusplus/Icons.h> -#include <QtGui/QStandardItem> -#include <QtCore/QDebug> +#include <QStandardItem> +#include <QDebug> namespace ClassView { namespace Constants { diff --git a/src/plugins/classview/classviewutils.h b/src/plugins/classview/classviewutils.h index 660d971f1b..7e7a32ad2b 100644 --- a/src/plugins/classview/classviewutils.h +++ b/src/plugins/classview/classviewutils.h @@ -35,9 +35,9 @@ #include "classviewsymbollocation.h" #include "classviewsymbolinformation.h" -#include <QtCore/QVariant> -#include <QtCore/QList> -#include <QtCore/QSet> +#include <QVariant> +#include <QList> +#include <QSet> QT_FORWARD_DECLARE_CLASS(QStandardItem) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index c590fa7d27..31682c06b8 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -42,7 +42,7 @@ #include <projectexplorer/buildsteplist.h> #include <utils/qtcassert.h> -#include <QtGui/QInputDialog> +#include <QInputDialog> using namespace CMakeProjectManager; using namespace Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 39c6d153ba..27057cce2e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -45,7 +45,7 @@ #include <texteditor/texteditorconstants.h> #include <texteditor/texteditorsettings.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace CMakeProjectManager; using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakeeditorfactory.h b/src/plugins/cmakeprojectmanager/cmakeeditorfactory.h index 54a007e2d6..7a61cf10ff 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditorfactory.h +++ b/src/plugins/cmakeprojectmanager/cmakeeditorfactory.h @@ -37,7 +37,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace TextEditor { class TextEditorActionHandler; diff --git a/src/plugins/cmakeprojectmanager/cmakehighlighter.cpp b/src/plugins/cmakeprojectmanager/cmakehighlighter.cpp index 04c17a83fb..48093a80fc 100644 --- a/src/plugins/cmakeprojectmanager/cmakehighlighter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakehighlighter.cpp @@ -32,10 +32,10 @@ #include "cmakehighlighter.h" -#include <QtCore/QRegExp> -#include <QtGui/QColor> -#include <QtGui/QTextDocument> -#include <QtGui/QTextEdit> +#include <QRegExp> +#include <QColor> +#include <QTextDocument> +#include <QTextEdit> using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakehighlighter.h b/src/plugins/cmakeprojectmanager/cmakehighlighter.h index 3b910d2951..9ffb6ae4c7 100644 --- a/src/plugins/cmakeprojectmanager/cmakehighlighter.h +++ b/src/plugins/cmakeprojectmanager/cmakehighlighter.h @@ -34,9 +34,9 @@ #define CMAKEHIGHLIGHTER_H #include <texteditor/syntaxhighlighter.h> -#include <QtCore/QtAlgorithms> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextCharFormat> +#include <QtAlgorithms> +#include <QSyntaxHighlighter> +#include <QTextCharFormat> namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h index 8c89b719d7..57481bb77a 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h @@ -35,7 +35,7 @@ #include <locator/ilocatorfilter.h> -#include <QtGui/QIcon> +#include <QIcon> namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index c8e82e7f7c..4e2ca18f4e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -48,13 +48,13 @@ #include <projectexplorer/abi.h> #include <texteditor/fontsettings.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QPlainTextEdit> -#include <QtCore/QDateTime> -#include <QtCore/QStringList> +#include <QVBoxLayout> +#include <QFormLayout> +#include <QLabel> +#include <QPushButton> +#include <QPlainTextEdit> +#include <QDateTime> +#include <QStringList> using namespace CMakeProjectManager; using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h index bde6f3a7c8..5a0984de77 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h @@ -37,11 +37,11 @@ #include <utils/wizard.h> #include <utils/qtcprocess.h> -#include <QtGui/QPushButton> -#include <QtGui/QComboBox> -#include <QtGui/QLineEdit> -#include <QtGui/QLabel> -#include <QtGui/QPlainTextEdit> +#include <QPushButton> +#include <QComboBox> +#include <QLineEdit> +#include <QLabel> +#include <QPlainTextEdit> namespace Utils { class PathChooser; diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 202a6dd174..3b0b3117ea 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -54,14 +54,14 @@ #include <coreplugin/infobar.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QMap> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QDateTime> -#include <QtCore/QProcess> -#include <QtGui/QFormLayout> -#include <QtGui/QMainWindow> -#include <QtGui/QInputDialog> +#include <QMap> +#include <QDebug> +#include <QDir> +#include <QDateTime> +#include <QProcess> +#include <QFormLayout> +#include <QMainWindow> +#include <QInputDialog> using namespace CMakeProjectManager; using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h index 1fe60a1c1d..24bee0b1b1 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.h +++ b/src/plugins/cmakeprojectmanager/cmakeproject.h @@ -47,10 +47,10 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QFileSystemWatcher> -#include <QtGui/QPushButton> -#include <QtGui/QLineEdit> +#include <QXmlStreamReader> +#include <QFileSystemWatcher> +#include <QPushButton> +#include <QLineEdit> namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 7a4d51022d..3dc2f4897d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -46,17 +46,17 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorer.h> #include <utils/QtConcurrentTools> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QCoreApplication> -#include <QtCore/QSettings> -#include <QtCore/QDateTime> -#include <QtGui/QFormLayout> -#include <QtGui/QBoxLayout> -#include <QtGui/QDesktopServices> -#include <QtGui/QApplication> -#include <QtGui/QLabel> -#include <QtGui/QGroupBox> -#include <QtGui/QSpacerItem> +#include <QtConcurrentRun> +#include <QCoreApplication> +#include <QSettings> +#include <QDateTime> +#include <QFormLayout> +#include <QBoxLayout> +#include <QDesktopServices> +#include <QApplication> +#include <QLabel> +#include <QGroupBox> +#include <QSpacerItem> using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index 338b1fdfdd..67844782d4 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -42,10 +42,10 @@ #include <utils/environment.h> #include <utils/pathchooser.h> -#include <QtCore/QFuture> -#include <QtCore/QStringList> -#include <QtCore/QDir> -#include <QtGui/QAction> +#include <QFuture> +#include <QStringList> +#include <QDir> +#include <QAction> QT_FORWARD_DECLARE_CLASS(QProcess) QT_FORWARD_DECLARE_CLASS(QLabel) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index b03054377a..9f0749e90e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -43,8 +43,8 @@ #include <coreplugin/mimedatabase.h> #include <texteditor/texteditoractionhandler.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> +#include <QtPlugin> +#include <QDebug> using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h index a731955336..913f1b2ced 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h @@ -35,7 +35,7 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> +#include <QObject> namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 267d2b3251..31867236fb 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -49,13 +49,13 @@ #include <utils/qtcprocess.h> #include <utils/stringutils.h> -#include <QtGui/QFormLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QGroupBox> -#include <QtGui/QLabel> -#include <QtGui/QComboBox> -#include <QtGui/QToolButton> -#include <QtGui/QCheckBox> +#include <QFormLayout> +#include <QLineEdit> +#include <QGroupBox> +#include <QLabel> +#include <QComboBox> +#include <QToolButton> +#include <QCheckBox> using namespace CMakeProjectManager; using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/cmakeprojectmanager/cmaketarget.cpp b/src/plugins/cmakeprojectmanager/cmaketarget.cpp index 42a206f9c6..36ccd1ca7e 100644 --- a/src/plugins/cmakeprojectmanager/cmaketarget.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketarget.cpp @@ -42,8 +42,8 @@ #include <projectexplorer/customexecutablerunconfiguration.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtGui/QApplication> -#include <QtGui/QStyle> +#include <QApplication> +#include <QStyle> using namespace CMakeProjectManager; using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp index 7a248e7da5..fb1a727936 100644 --- a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp @@ -37,7 +37,7 @@ #include <cplusplus/ModelManagerInterface.h> -#include <QtCore/QProcess> +#include <QProcess> using namespace CMakeProjectManager; using namespace Internal; diff --git a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h index c3f99504e7..2fe7cc0ffc 100644 --- a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h +++ b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h @@ -36,7 +36,7 @@ #include <cplusplus/ModelManagerInterface.h> #include <cpptools/uicodecompletionsupport.h> -#include <QtCore/QDateTime> +#include <QDateTime> namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index 323cf5de0d..b2f4965b2a 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -45,11 +45,11 @@ #include <utils/qtcprocess.h> -#include <QtGui/QFormLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QCheckBox> -#include <QtGui/QLineEdit> -#include <QtGui/QListWidget> +#include <QFormLayout> +#include <QGroupBox> +#include <QCheckBox> +#include <QLineEdit> +#include <QListWidget> using namespace CMakeProjectManager; using namespace CMakeProjectManager::Internal; diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index 30896c45f6..4cce3a656c 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -40,10 +40,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtGui/QAction> -#include <QtGui/QMenuBar> +#include <QDebug> +#include <QTimer> +#include <QAction> +#include <QMenuBar> Q_DECLARE_METATYPE(Core::Internal::MenuActionContainer*) diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h index 2071bdc9be..c05e53dde7 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h @@ -35,7 +35,7 @@ #include "coreplugin/id.h" -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QMenu; diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index a87592a368..a4c8a088f4 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -40,14 +40,14 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtGui/QDesktopWidget> -#include <QtGui/QLabel> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QShortcut> -#include <QtGui/QMenuBar> +#include <QDebug> +#include <QSettings> +#include <QDesktopWidget> +#include <QLabel> +#include <QMenu> +#include <QAction> +#include <QShortcut> +#include <QMenuBar> namespace { enum { warnAboutFindFailures = 0 }; diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index f4b3252aa0..61dc0f47a8 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -38,8 +38,8 @@ #include <coreplugin/actionmanager/command.h> #include "coreplugin/icontext.h" -#include <QtCore/QObject> -#include <QtCore/QList> +#include <QObject> +#include <QList> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h index 8f40962c4e..12191ebbcd 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h @@ -37,10 +37,10 @@ #include <coreplugin/actionmanager/command_p.h> #include <coreplugin/icontext.h> -#include <QtCore/QMap> -#include <QtCore/QHash> -#include <QtCore/QMultiHash> -#include <QtCore/QTimer> +#include <QMap> +#include <QHash> +#include <QMultiHash> +#include <QTimer> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index fb171dee68..a7e8c4b695 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -36,12 +36,12 @@ #include "icontext.h" #include "id.h" -#include <QtCore/QDebug> -#include <QtCore/QTextStream> +#include <QDebug> +#include <QTextStream> -#include <QtGui/QAction> -#include <QtGui/QShortcut> -#include <QtGui/QMainWindow> +#include <QAction> +#include <QShortcut> +#include <QMainWindow> /*! \class Core::Command diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h index 7f04c4994c..c7c9dcaaae 100644 --- a/src/plugins/coreplugin/actionmanager/command.h +++ b/src/plugins/coreplugin/actionmanager/command.h @@ -36,7 +36,7 @@ #include <coreplugin/core_global.h> #include <coreplugin/id.h> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h index 4e44c9e754..da61ee85e1 100644 --- a/src/plugins/coreplugin/actionmanager/command_p.h +++ b/src/plugins/coreplugin/actionmanager/command_p.h @@ -40,11 +40,11 @@ #include <utils/proxyaction.h> -#include <QtCore/QList> -#include <QtCore/QMultiMap> -#include <QtCore/QPointer> -#include <QtCore/QMap> -#include <QtGui/QKeySequence> +#include <QList> +#include <QMultiMap> +#include <QPointer> +#include <QMap> +#include <QKeySequence> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index 69060ff2c9..7709fff66c 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -44,12 +44,12 @@ #include <utils/treewidgetcolumnstretcher.h> -#include <QtGui/QKeyEvent> -#include <QtGui/QShortcut> -#include <QtGui/QHeaderView> -#include <QtGui/QTreeWidgetItem> -#include <QtGui/QFileDialog> -#include <QtCore/QCoreApplication> +#include <QKeyEvent> +#include <QShortcut> +#include <QHeaderView> +#include <QTreeWidgetItem> +#include <QFileDialog> +#include <QCoreApplication> #include <QtDebug> Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*) diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index d91ba1e6fc..91b89fdc95 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -35,7 +35,7 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QLineEdit; diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index 05a662826e..24c5fbf4ea 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -42,12 +42,12 @@ #include <utils/fileutils.h> -#include <QtCore/QFile> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QDebug> -#include <QtCore/QDateTime> +#include <QFile> +#include <QXmlStreamAttributes> +#include <QXmlStreamWriter> +#include <QXmlStreamReader> +#include <QDebug> +#include <QDateTime> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.h b/src/plugins/coreplugin/actionmanager/commandsfile.h index 01077e317a..fed98dfc70 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.h +++ b/src/plugins/coreplugin/actionmanager/commandsfile.h @@ -33,10 +33,10 @@ #ifndef COMMANDSFILE_H #define COMMANDSFILE_H -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QMap> -#include <QtGui/QKeySequence> +#include <QObject> +#include <QString> +#include <QMap> +#include <QKeySequence> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index 125e5b5090..b47ff946c6 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -44,20 +44,20 @@ #include <utils/stringutils.h> #include <utils/fileutils.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QVector> -#include <QtCore/QDebug> -#include <QtCore/QSharedData> -#include <QtCore/QEventLoop> -#include <QtCore/QSharedPointer> -#include <QtCore/QScopedPointer> - -#include <QtGui/QMessageBox> -#include <QtGui/QWizard> -#include <QtGui/QMainWindow> -#include <QtGui/QIcon> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QVector> +#include <QDebug> +#include <QSharedData> +#include <QEventLoop> +#include <QSharedPointer> +#include <QScopedPointer> + +#include <QMessageBox> +#include <QWizard> +#include <QMainWindow> +#include <QIcon> enum { debugWizard = 0 }; diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h index acd7634719..9701857fd1 100644 --- a/src/plugins/coreplugin/basefilewizard.h +++ b/src/plugins/coreplugin/basefilewizard.h @@ -40,8 +40,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QSharedDataPointer> -#include <QtCore/QList> +#include <QSharedDataPointer> +#include <QList> QT_BEGIN_NAMESPACE class QIcon; diff --git a/src/plugins/coreplugin/core_global.h b/src/plugins/coreplugin/core_global.h index 23ebe70a3f..e2e122c733 100644 --- a/src/plugins/coreplugin/core_global.h +++ b/src/plugins/coreplugin/core_global.h @@ -33,7 +33,7 @@ #ifndef CORE_GLOBAL_H #define CORE_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(CORE_LIBRARY) # define CORE_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 904d6478e7..f0a3714bda 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -33,7 +33,7 @@ #ifndef CORECONSTANTS_H #define CORECONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Core { namespace Constants { diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 3fe8bd1932..7178f52028 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -42,8 +42,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> +#include <QtPlugin> +#include <QDebug> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp index d6182a8a5b..bf9a33a2b0 100644 --- a/src/plugins/coreplugin/designmode.cpp +++ b/src/plugins/coreplugin/designmode.cpp @@ -45,14 +45,14 @@ #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> -#include <QtCore/QPair> -#include <QtCore/QFileInfo> -#include <QtCore/QStringList> -#include <QtCore/QDebug> - -#include <QtGui/QAction> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QStackedWidget> +#include <QPair> +#include <QFileInfo> +#include <QStringList> +#include <QDebug> + +#include <QAction> +#include <QPlainTextEdit> +#include <QStackedWidget> static Core::DesignMode *m_instance = 0; diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 4911429769..433af38cb0 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -38,11 +38,11 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/variablechooser.h> -#include <QtCore/QTextStream> -#include <QtCore/QFile> -#include <QtCore/QMimeData> -#include <QtGui/QMessageBox> -#include <QtGui/QMenu> +#include <QTextStream> +#include <QFile> +#include <QMimeData> +#include <QMessageBox> +#include <QMenu> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h index 35f045c60e..00afbd63f2 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h @@ -35,8 +35,8 @@ #include "coreplugin/externaltool.h" -#include <QtGui/QWidget> -#include <QtCore/QAbstractItemModel> +#include <QWidget> +#include <QAbstractItemModel> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index e95271313b..0bf1d8a9b2 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -35,7 +35,7 @@ #include <coreplugin/core_global.h> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QIcon; diff --git a/src/plugins/coreplugin/dialogs/iwizard.cpp b/src/plugins/coreplugin/dialogs/iwizard.cpp index b246353731..3b16d7f59b 100644 --- a/src/plugins/coreplugin/dialogs/iwizard.cpp +++ b/src/plugins/coreplugin/dialogs/iwizard.cpp @@ -35,7 +35,7 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QStringList> +#include <QStringList> /*! \class Core::IWizard diff --git a/src/plugins/coreplugin/dialogs/iwizard.h b/src/plugins/coreplugin/dialogs/iwizard.h index ec26f69650..50383da148 100644 --- a/src/plugins/coreplugin/dialogs/iwizard.h +++ b/src/plugins/coreplugin/dialogs/iwizard.h @@ -36,7 +36,7 @@ #include <coreplugin/core_global.h> #include <coreplugin/featureprovider.h> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QIcon; diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index 201c529c9e..1b5fe98fd3 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -39,15 +39,15 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/featureprovider.h> -#include <QtGui/QAbstractProxyModel> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QHeaderView> -#include <QtGui/QPushButton> -#include <QtGui/QStandardItem> -#include <QtGui/QItemDelegate> -#include <QtGui/QPainter> -#include <QtCore/QDebug> +#include <QAbstractProxyModel> +#include <QSortFilterProxyModel> +#include <QItemSelectionModel> +#include <QHeaderView> +#include <QPushButton> +#include <QStandardItem> +#include <QItemDelegate> +#include <QPainter> +#include <QDebug> Q_DECLARE_METATYPE(Core::IWizard*) diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h index ff6b9d529c..623502c08e 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.h +++ b/src/plugins/coreplugin/dialogs/newdialog.h @@ -35,10 +35,10 @@ #include "iwizard.h" -#include <QtGui/QDialog> -#include <QtGui/QIcon> -#include <QtCore/QList> -#include <QtCore/QModelIndex> +#include <QDialog> +#include <QIcon> +#include <QList> +#include <QModelIndex> QT_BEGIN_NAMESPACE class QAbstractProxyModel; diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp index 782005e254..298b565594 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp +++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp @@ -32,9 +32,9 @@ #include "openwithdialog.h" -#include <QtGui/QListWidget> -#include <QtGui/QPushButton> -#include <QtCore/QFileInfo> +#include <QListWidget> +#include <QPushButton> +#include <QFileInfo> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.h b/src/plugins/coreplugin/dialogs/openwithdialog.h index 9364f10aa0..08494078a9 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.h +++ b/src/plugins/coreplugin/dialogs/openwithdialog.h @@ -33,7 +33,7 @@ #ifndef OPENWITHDIALOG_H #define OPENWITHDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> #include "ui_openwithdialog.h" namespace Core { diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp index e09b70a498..8962500bf2 100644 --- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp +++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp @@ -34,14 +34,14 @@ #include <utils/stringutils.h> -#include <QtGui/QTreeView> -#include <QtGui/QLabel> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QVBoxLayout> - -#include <QtCore/QDir> +#include <QTreeView> +#include <QLabel> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QDialogButtonBox> +#include <QVBoxLayout> + +#include <QDir> enum { FileNameRole = Qt::UserRole + 1 }; diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h index 433042a44d..0c742030c3 100644 --- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h +++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h @@ -33,7 +33,7 @@ #ifndef PROMPTOVERWRITEDIALOG_H #define PROMPTOVERWRITEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QTreeView; diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp index a6836a0f08..2eb3dda40d 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp @@ -36,12 +36,12 @@ #include <coreplugin/ifile.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtGui/QPushButton> -#include <QtGui/QTreeWidget> -#include <QtGui/QHeaderView> -#include <QtGui/QCheckBox> +#include <QDir> +#include <QFileInfo> +#include <QPushButton> +#include <QTreeWidget> +#include <QHeaderView> +#include <QCheckBox> Q_DECLARE_METATYPE(Core::IFile*) diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.h b/src/plugins/coreplugin/dialogs/saveitemsdialog.h index dd96bb443d..384306f034 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h @@ -33,8 +33,8 @@ #ifndef SAVEITEMSDIALOG_H #define SAVEITEMSDIALOG_H -#include <QtCore/QList> -#include <QtGui/QDialog> +#include <QList> +#include <QDialog> #include "ui_saveitemsdialog.h" diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index a707de4515..ac0b594831 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -37,27 +37,27 @@ #include <utils/filterlineedit.h> -#include <QtCore/QSettings> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QHBoxLayout> -#include <QtGui/QIcon> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> -#include <QtGui/QToolBar> -#include <QtGui/QScrollBar> -#include <QtGui/QSpacerItem> -#include <QtGui/QStyle> -#include <QtGui/QStackedLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QFrame> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QListView> -#include <QtGui/QApplication> -#include <QtGui/QGroupBox> -#include <QtGui/QStyledItemDelegate> +#include <QSettings> +#include <QSortFilterProxyModel> +#include <QItemSelectionModel> +#include <QHBoxLayout> +#include <QIcon> +#include <QLabel> +#include <QPushButton> +#include <QToolButton> +#include <QToolBar> +#include <QScrollBar> +#include <QSpacerItem> +#include <QStyle> +#include <QStackedLayout> +#include <QGridLayout> +#include <QLineEdit> +#include <QFrame> +#include <QDialogButtonBox> +#include <QListView> +#include <QApplication> +#include <QGroupBox> +#include <QStyledItemDelegate> static const char categoryKeyC[] = "General/LastPreferenceCategory"; static const char pageKeyC[] = "General/LastPreferencePage"; diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h index 6a79a21af1..b70b86dd88 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.h +++ b/src/plugins/coreplugin/dialogs/settingsdialog.h @@ -35,11 +35,11 @@ #include "coreplugin/dialogs/ioptionspage.h" -#include <QtCore/QList> -#include <QtCore/QSet> -#include <QtCore/QPointer> -#include <QtCore/QEventLoop> -#include <QtGui/QDialog> +#include <QList> +#include <QSet> +#include <QPointer> +#include <QEventLoop> +#include <QDialog> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 75d38d4246..dd3f45c6fb 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -42,15 +42,15 @@ #include <utils/treewidgetcolumnstretcher.h> -#include <QtGui/QKeyEvent> -#include <QtGui/QShortcut> -#include <QtGui/QHeaderView> -#include <QtGui/QFileDialog> -#include <QtGui/QLineEdit> -#include <QtGui/QAction> -#include <QtGui/QKeyEvent> -#include <QtGui/QTreeWidgetItem> -#include <QtCore/QCoreApplication> +#include <QKeyEvent> +#include <QShortcut> +#include <QHeaderView> +#include <QFileDialog> +#include <QLineEdit> +#include <QAction> +#include <QKeyEvent> +#include <QTreeWidgetItem> +#include <QCoreApplication> #include <QtDebug> Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*) diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index 81f6293d42..38412f6c08 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -35,7 +35,7 @@ #include <coreplugin/actionmanager/commandmappings.h> -#include <QtGui/QKeySequence> +#include <QKeySequence> QT_BEGIN_NAMESPACE class QKeyEvent; diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp index 7969fe45f4..24a1aefd1e 100644 --- a/src/plugins/coreplugin/editmode.cpp +++ b/src/plugins/coreplugin/editmode.cpp @@ -42,11 +42,11 @@ #include "ieditor.h" #include "ifile.h" -#include <QtCore/QLatin1String> -#include <QtGui/QHBoxLayout> -#include <QtGui/QWidget> -#include <QtGui/QSplitter> -#include <QtGui/QIcon> +#include <QLatin1String> +#include <QHBoxLayout> +#include <QWidget> +#include <QSplitter> +#include <QIcon> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 2f844de752..26c9a7ef4f 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -65,27 +65,27 @@ #include <utils/consoleprocess.h> #include <utils/qtcassert.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QMap> -#include <QtCore/QProcess> -#include <QtCore/QSet> -#include <QtCore/QSettings> -#include <QtCore/QTextCodec> -#include <QtCore/QTimer> - -#include <QtGui/QAction> -#include <QtGui/QShortcut> -#include <QtGui/QApplication> -#include <QtGui/QFileDialog> -#include <QtGui/QLayout> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QSplitter> -#include <QtGui/QStackedLayout> +#include <QDateTime> +#include <QDebug> +#include <QFileInfo> +#include <QMap> +#include <QProcess> +#include <QSet> +#include <QSettings> +#include <QTextCodec> +#include <QTimer> + +#include <QAction> +#include <QShortcut> +#include <QApplication> +#include <QFileDialog> +#include <QLayout> +#include <QMainWindow> +#include <QMenu> +#include <QMessageBox> +#include <QPushButton> +#include <QSplitter> +#include <QStackedLayout> enum { debugEditorManager=0 }; diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index 9ca8a2790e..3df12fc46b 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -38,9 +38,9 @@ #include <coreplugin/id.h> #include <coreplugin/ifile.h> // enumerations -#include <QtCore/QList> -#include <QtGui/QWidget> -#include <QtGui/QMenu> +#include <QList> +#include <QWidget> +#include <QMenu> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 2ffbc9a270..99090b4a14 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -45,26 +45,26 @@ #include <coreplugin/findplaceholder.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QMimeData> - -#include <QtGui/QApplication> -#include <QtGui/QComboBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QMouseEvent> -#include <QtGui/QPainter> -#include <QtGui/QStackedWidget> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> -#include <QtGui/QToolButton> -#include <QtGui/QMenu> -#include <QtGui/QClipboard> -#include <QtGui/QAction> -#include <QtGui/QSplitter> -#include <QtGui/QStackedLayout> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QMimeData> + +#include <QApplication> +#include <QComboBox> +#include <QHBoxLayout> +#include <QLabel> +#include <QMouseEvent> +#include <QPainter> +#include <QStackedWidget> +#include <QStyle> +#include <QStyleOption> +#include <QToolButton> +#include <QMenu> +#include <QClipboard> +#include <QAction> +#include <QSplitter> +#include <QStackedLayout> #ifdef Q_OS_MAC #include <qmacstyle_mac.h> diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h index 2ae6b04aaf..40275797eb 100644 --- a/src/plugins/coreplugin/editormanager/editorview.h +++ b/src/plugins/coreplugin/editormanager/editorview.h @@ -35,14 +35,14 @@ #include "coreplugin/id.h" -#include <QtCore/QMap> -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QPointer> -#include <QtCore/QVariant> - -#include <QtGui/QIcon> -#include <QtGui/QWidget> +#include <QMap> +#include <QList> +#include <QString> +#include <QPointer> +#include <QVariant> + +#include <QIcon> +#include <QWidget> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h index 30eb6e8c68..f06b2e2cee 100644 --- a/src/plugins/coreplugin/editormanager/ieditor.h +++ b/src/plugins/coreplugin/editormanager/ieditor.h @@ -37,7 +37,7 @@ #include <coreplugin/icontext.h> #include <coreplugin/id.h> -#include <QtCore/QMetaType> +#include <QMetaType> namespace Core { diff --git a/src/plugins/coreplugin/editormanager/iexternaleditor.h b/src/plugins/coreplugin/editormanager/iexternaleditor.h index 7c3db34f22..c5c97fef56 100644 --- a/src/plugins/coreplugin/editormanager/iexternaleditor.h +++ b/src/plugins/coreplugin/editormanager/iexternaleditor.h @@ -35,7 +35,7 @@ #include <coreplugin/core_global.h> -#include <QtCore/QObject> +#include <QObject> namespace Core { diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp index cdd6f36c91..2b9873cbe6 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp @@ -34,8 +34,8 @@ #include "ieditor.h" #include "ifile.h" -#include <QtCore/QDir> -#include <QtGui/QIcon> +#include <QDir> +#include <QIcon> namespace Core { diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.h b/src/plugins/coreplugin/editormanager/openeditorsmodel.h index 0a8211e0ec..6c168ac331 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsmodel.h +++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.h @@ -36,7 +36,7 @@ #include "../core_global.h" #include "../id.h" -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> QT_FORWARD_DECLARE_CLASS(QIcon) diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index 3aa2810eef..c7a232876f 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -43,13 +43,13 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <utils/qtcassert.h> -#include <QtCore/QTimer> -#include <QtGui/QMenu> -#include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> -#include <QtGui/QHeaderView> -#include <QtGui/QKeyEvent> +#include <QTimer> +#include <QMenu> +#include <QPainter> +#include <QStyle> +#include <QStyleOption> +#include <QHeaderView> +#include <QKeyEvent> #ifdef Q_OS_MAC #include <qmacstyle_mac.h> #endif diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h index 964e660f73..9bb4ac4bfd 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.h +++ b/src/plugins/coreplugin/editormanager/openeditorsview.h @@ -37,7 +37,7 @@ #include <coreplugin/inavigationwidgetfactory.h> -#include <QtGui/QStyledItemDelegate> +#include <QStyledItemDelegate> namespace Core { class IEditor; diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp index d5074e440c..6264427095 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp @@ -38,10 +38,10 @@ #include <utils/qtcassert.h> -#include <QtGui/QFocusEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QTreeWidget> -#include <QtGui/QVBoxLayout> +#include <QFocusEvent> +#include <QHeaderView> +#include <QTreeWidget> +#include <QVBoxLayout> Q_DECLARE_METATYPE(Core::Internal::EditorView*) Q_DECLARE_METATYPE(Core::IFile *) diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.h b/src/plugins/coreplugin/editormanager/openeditorswindow.h index 80d2d58e42..aa4249f0e8 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.h +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.h @@ -33,8 +33,8 @@ #ifndef OPENEDITORSWINDOW_H #define OPENEDITORSWINDOW_H -#include <QtGui/QFrame> -#include <QtGui/QIcon> +#include <QFrame> +#include <QIcon> QT_BEGIN_NAMESPACE class QTreeWidgetItem; diff --git a/src/plugins/coreplugin/editormanager/systemeditor.cpp b/src/plugins/coreplugin/editormanager/systemeditor.cpp index d86ed5a8db..e6aebc39d1 100644 --- a/src/plugins/coreplugin/editormanager/systemeditor.cpp +++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp @@ -33,9 +33,9 @@ #include "systemeditor.h" #include "id.h" -#include <QtCore/QStringList> -#include <QtCore/QUrl> -#include <QtGui/QDesktopServices> +#include <QStringList> +#include <QUrl> +#include <QDesktopServices> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 66fc23b3d2..17e3e62f74 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -50,21 +50,21 @@ #include <utils/qtcassert.h> #include <utils/styledbar.h> -#include <QtCore/QSettings> -#include <QtCore/QEvent> -#include <QtCore/QDir> -#include <QtCore/QPointer> -#include <QtGui/QApplication> -#include <QtGui/QComboBox> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QVBoxLayout> -#include <QtGui/QScrollArea> -#include <QtGui/QTabWidget> -#include <QtGui/QToolButton> -#include <QtGui/QMenu> -#include <QtGui/QClipboard> -#include <QtGui/QLabel> -#include <QtGui/QToolBar> +#include <QSettings> +#include <QEvent> +#include <QDir> +#include <QPointer> +#include <QApplication> +#include <QComboBox> +#include <QPlainTextEdit> +#include <QVBoxLayout> +#include <QScrollArea> +#include <QTabWidget> +#include <QToolButton> +#include <QMenu> +#include <QClipboard> +#include <QLabel> +#include <QToolBar> enum { debug = false diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h index b0164d496a..68fa6d3958 100644 --- a/src/plugins/coreplugin/editortoolbar.h +++ b/src/plugins/coreplugin/editortoolbar.h @@ -37,7 +37,7 @@ #include <utils/styledbar.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Core { class IEditor; diff --git a/src/plugins/coreplugin/eventfilteringmainwindow.cpp b/src/plugins/coreplugin/eventfilteringmainwindow.cpp index 488e32b3c2..b4a786b0ec 100644 --- a/src/plugins/coreplugin/eventfilteringmainwindow.cpp +++ b/src/plugins/coreplugin/eventfilteringmainwindow.cpp @@ -36,9 +36,9 @@ #include <windows.h> #endif -#include <QtCore/QtDebug> -#include <QtCore/QEvent> -#include <QtCore/QCoreApplication> +#include <QtDebug> +#include <QEvent> +#include <QCoreApplication> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/eventfilteringmainwindow.h b/src/plugins/coreplugin/eventfilteringmainwindow.h index 28595d7eca..ae534ecd90 100644 --- a/src/plugins/coreplugin/eventfilteringmainwindow.h +++ b/src/plugins/coreplugin/eventfilteringmainwindow.h @@ -33,7 +33,7 @@ #ifndef EVENTFILTERINGMAINWINDOW_H #define EVENTFILTERINGMAINWINDOW_H -#include <QtGui/QMainWindow> +#include <QMainWindow> QT_BEGIN_NAMESPACE diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index f6e5b9d233..8a9edc5584 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -49,14 +49,14 @@ #include <utils/fileutils.h> #include <utils/qtcprocess.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QDateTime> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QCoreApplication> +#include <QXmlStreamReader> +#include <QXmlStreamWriter> +#include <QDir> +#include <QFile> +#include <QDateTime> +#include <QMenu> +#include <QAction> #include <QtDebug> diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h index 9ebe217171..3e968a5bc7 100644 --- a/src/plugins/coreplugin/externaltool.h +++ b/src/plugins/coreplugin/externaltool.h @@ -33,12 +33,12 @@ #ifndef EXTERNALTOOL_H #define EXTERNALTOOL_H -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QProcess> -#include <QtCore/QSharedPointer> -#include <QtCore/QTextCodec> -#include <QtCore/QMetaType> +#include <QObject> +#include <QStringList> +#include <QProcess> +#include <QSharedPointer> +#include <QTextCodec> +#include <QMetaType> namespace Utils { class QtcProcess; diff --git a/src/plugins/coreplugin/externaltoolmanager.h b/src/plugins/coreplugin/externaltoolmanager.h index 691ecb038d..5387ca1b82 100644 --- a/src/plugins/coreplugin/externaltoolmanager.h +++ b/src/plugins/coreplugin/externaltoolmanager.h @@ -35,10 +35,10 @@ #include "core_global.h" -#include <QtCore/QObject> -#include <QtCore/QMap> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QObject> +#include <QMap> +#include <QList> +#include <QString> QT_FORWARD_DECLARE_CLASS(QAction) diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp index a464745664..25809c0a00 100644 --- a/src/plugins/coreplugin/fancyactionbar.cpp +++ b/src/plugins/coreplugin/fancyactionbar.cpp @@ -39,20 +39,20 @@ #include <coreplugin/icore.h> #include <coreplugin/imode.h> -#include <QtGui/QHBoxLayout> -#include <QtGui/QPainter> -#include <QtGui/QPicture> -#include <QtGui/QVBoxLayout> -#include <QtGui/QAction> -#include <QtGui/QStatusBar> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> -#include <QtGui/QMouseEvent> -#include <QtGui/QApplication> -#include <QtCore/QEvent> -#include <QtCore/QAnimationGroup> -#include <QtCore/QPropertyAnimation> -#include <QtCore/QDebug> +#include <QHBoxLayout> +#include <QPainter> +#include <QPicture> +#include <QVBoxLayout> +#include <QAction> +#include <QStatusBar> +#include <QStyle> +#include <QStyleOption> +#include <QMouseEvent> +#include <QApplication> +#include <QEvent> +#include <QAnimationGroup> +#include <QPropertyAnimation> +#include <QDebug> using namespace Core; using namespace Internal; diff --git a/src/plugins/coreplugin/fancyactionbar.h b/src/plugins/coreplugin/fancyactionbar.h index ab9eb2ae18..4fea4cb0a9 100644 --- a/src/plugins/coreplugin/fancyactionbar.h +++ b/src/plugins/coreplugin/fancyactionbar.h @@ -33,7 +33,7 @@ #ifndef FANCYACTIONBAR_H #define FANCYACTIONBAR_H -#include <QtGui/QToolButton> +#include <QToolButton> QT_BEGIN_NAMESPACE class QVBoxLayout; diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index e04b3c0a46..c154233b13 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -34,21 +34,21 @@ #include <utils/stylehelper.h> #include <utils/styledbar.h> -#include <QtCore/QDebug> - -#include <QtGui/QColorDialog> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QMouseEvent> -#include <QtGui/QWindowsStyle> -#include <QtGui/QPainter> -#include <QtGui/QSplitter> -#include <QtGui/QStackedLayout> -#include <QtGui/QStatusBar> -#include <QtGui/QToolButton> -#include <QtGui/QToolTip> -#include <QtCore/QAnimationGroup> -#include <QtCore/QPropertyAnimation> +#include <QDebug> + +#include <QColorDialog> +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QMouseEvent> +#include <QWindowsStyle> +#include <QPainter> +#include <QSplitter> +#include <QStackedLayout> +#include <QStatusBar> +#include <QToolButton> +#include <QToolTip> +#include <QAnimationGroup> +#include <QPropertyAnimation> using namespace Core; using namespace Internal; diff --git a/src/plugins/coreplugin/fancytabwidget.h b/src/plugins/coreplugin/fancytabwidget.h index abfe595207..a724b23c1c 100644 --- a/src/plugins/coreplugin/fancytabwidget.h +++ b/src/plugins/coreplugin/fancytabwidget.h @@ -33,11 +33,11 @@ #ifndef FANCYTABWIDGET_H #define FANCYTABWIDGET_H -#include <QtGui/QIcon> -#include <QtGui/QWidget> +#include <QIcon> +#include <QWidget> -#include <QtCore/QTimer> -#include <QtCore/QPropertyAnimation> +#include <QTimer> +#include <QPropertyAnimation> QT_BEGIN_NAMESPACE class QPainter; diff --git a/src/plugins/coreplugin/featureprovider.h b/src/plugins/coreplugin/featureprovider.h index 9d0bb20d55..8e130e96fb 100644 --- a/src/plugins/coreplugin/featureprovider.h +++ b/src/plugins/coreplugin/featureprovider.h @@ -37,9 +37,9 @@ #include <coreplugin/id.h> -#include <QtCore/QObject> -#include <QtCore/QSet> -#include <QtCore/QStringList> +#include <QObject> +#include <QSet> +#include <QStringList> namespace Utils { diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index bae11d024c..458d7cfcca 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -35,16 +35,16 @@ #include <utils/qtcassert.h> -#include <QtGui/QApplication> -#include <QtGui/QStyle> -#include <QtGui/QPainter> -#include <QtCore/QFileInfo> -#include <QtCore/QPair> -#include <QtCore/QDebug> - -#include <QtGui/QFileIconProvider> -#include <QtGui/QIcon> -#include <QtGui/QStyle> +#include <QApplication> +#include <QStyle> +#include <QPainter> +#include <QFileInfo> +#include <QPair> +#include <QDebug> + +#include <QFileIconProvider> +#include <QIcon> +#include <QStyle> /*! \class Core::FileIconProvider diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h index 847aaa86fd..5a7059c3fd 100644 --- a/src/plugins/coreplugin/fileiconprovider.h +++ b/src/plugins/coreplugin/fileiconprovider.h @@ -35,8 +35,8 @@ #include <coreplugin/core_global.h> -#include <QtGui/QStyle> -#include <QtGui/QFileIconProvider> +#include <QStyle> +#include <QFileIconProvider> QT_BEGIN_NAMESPACE class QFileInfo; diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp index 0979184298..8736ea1aa8 100644 --- a/src/plugins/coreplugin/filemanager.cpp +++ b/src/plugins/coreplugin/filemanager.cpp @@ -48,20 +48,20 @@ #include <utils/pathchooser.h> #include <utils/reloadpromptutils.h> -#include <QtCore/QDateTime> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QFileSystemWatcher> -#include <QtCore/QPair> -#include <QtCore/QSettings> -#include <QtCore/QTimer> -#include <QtGui/QAction> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QDateTime> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QFileSystemWatcher> +#include <QPair> +#include <QSettings> +#include <QTimer> +#include <QAction> +#include <QFileDialog> +#include <QMainWindow> +#include <QMenu> +#include <QMessageBox> +#include <QPushButton> /*! \class Core::FileManager diff --git a/src/plugins/coreplugin/filemanager.h b/src/plugins/coreplugin/filemanager.h index b2bd2c6219..e569bc6088 100644 --- a/src/plugins/coreplugin/filemanager.h +++ b/src/plugins/coreplugin/filemanager.h @@ -35,10 +35,10 @@ #include <coreplugin/id.h> -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QPair> -#include <QtCore/QVariant> +#include <QObject> +#include <QStringList> +#include <QPair> +#include <QVariant> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp index 377053be04..369c132403 100644 --- a/src/plugins/coreplugin/fileutils.cpp +++ b/src/plugins/coreplugin/fileutils.cpp @@ -34,12 +34,12 @@ #include <utils/environment.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtGui/QWidget> +#include <QDir> +#include <QFileInfo> +#include <QProcess> +#include <QApplication> +#include <QMessageBox> +#include <QWidget> #ifndef Q_OS_WIN #include <coreplugin/icore.h> @@ -48,7 +48,7 @@ #ifndef Q_OS_MAC #include <coreplugin/coreconstants.h> #include <utils/unixutils.h> -#include <QtGui/QPushButton> +#include <QPushButton> #endif #endif diff --git a/src/plugins/coreplugin/findplaceholder.cpp b/src/plugins/coreplugin/findplaceholder.cpp index 4420ff5083..50eb340c94 100644 --- a/src/plugins/coreplugin/findplaceholder.cpp +++ b/src/plugins/coreplugin/findplaceholder.cpp @@ -34,7 +34,7 @@ #include <extensionsystem/pluginmanager.h> -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> using namespace Core; diff --git a/src/plugins/coreplugin/findplaceholder.h b/src/plugins/coreplugin/findplaceholder.h index e50cf80aed..ad906e78e0 100644 --- a/src/plugins/coreplugin/findplaceholder.h +++ b/src/plugins/coreplugin/findplaceholder.h @@ -35,8 +35,8 @@ #include "core_global.h" -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QPointer> +#include <QWidget> namespace Core { diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 8e7fc1ab69..36e93d0a3c 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -40,14 +40,14 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> - -#include <QtCore/QCoreApplication> -#include <QtCore/QTextStream> -#include <QtCore/QDir> -#include <QtCore/QLibraryInfo> -#include <QtCore/QSettings> +#include <QMainWindow> +#include <QMessageBox> + +#include <QCoreApplication> +#include <QTextStream> +#include <QDir> +#include <QLibraryInfo> +#include <QSettings> #include "ui_generalsettings.h" diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h index 3624eff5e2..66ccbeb814 100644 --- a/src/plugins/coreplugin/generalsettings.h +++ b/src/plugins/coreplugin/generalsettings.h @@ -34,7 +34,7 @@ #define GENERALSETTINGS_H #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QPointer> +#include <QPointer> QT_BEGIN_NAMESPACE class QMessageBox; diff --git a/src/plugins/coreplugin/generatedfile.cpp b/src/plugins/coreplugin/generatedfile.cpp index 1f3df606f0..4185aa122c 100644 --- a/src/plugins/coreplugin/generatedfile.cpp +++ b/src/plugins/coreplugin/generatedfile.cpp @@ -35,9 +35,9 @@ #include <utils/fileutils.h> -#include <QtCore/QString> -#include <QtCore/QDir> -#include <QtCore/QCoreApplication> +#include <QString> +#include <QDir> +#include <QCoreApplication> namespace Core { diff --git a/src/plugins/coreplugin/generatedfile.h b/src/plugins/coreplugin/generatedfile.h index 7c7c3e7963..e6f9f61568 100644 --- a/src/plugins/coreplugin/generatedfile.h +++ b/src/plugins/coreplugin/generatedfile.h @@ -36,8 +36,8 @@ #include "coreplugin/id.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QList> +#include <QSharedDataPointer> +#include <QList> namespace Core { class GeneratedFilePrivate; diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp index 7f54267e0b..3852e1a113 100644 --- a/src/plugins/coreplugin/helpmanager.cpp +++ b/src/plugins/coreplugin/helpmanager.cpp @@ -35,18 +35,18 @@ #include <coreplugin/icore.h> #include <utils/filesystemwatcher.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QStringList> - -#include <QtHelp/QHelpEngineCore> - -#include <QtSql/QSqlDatabase> -#include <QtSql/QSqlDriver> -#include <QtSql/QSqlError> -#include <QtSql/QSqlQuery> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QStringList> + +#include <QHelpEngineCore> + +#include <QSqlDatabase> +#include <QSqlDriver> +#include <QSqlError> +#include <QSqlQuery> namespace Core { diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h index 90924ae52e..dfcbe263fd 100644 --- a/src/plugins/coreplugin/helpmanager.h +++ b/src/plugins/coreplugin/helpmanager.h @@ -35,11 +35,11 @@ #include "core_global.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtCore/QMap> -#include <QtCore/QHash> +#include <QObject> +#include <QStringList> +#include <QVariant> +#include <QMap> +#include <QHash> QT_FORWARD_DECLARE_CLASS(QUrl) diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h index 272cf01fd9..191f97afd1 100644 --- a/src/plugins/coreplugin/icontext.h +++ b/src/plugins/coreplugin/icontext.h @@ -35,10 +35,10 @@ #include <coreplugin/core_global.h> -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QList> +#include <QObject> +#include <QPointer> +#include <QWidget> namespace Core { diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index ec480868f7..471cca42e0 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -347,11 +347,11 @@ #include "icore.h" #include "mainwindow.h" -#include <QtCore/QDir> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> +#include <QDir> +#include <QCoreApplication> +#include <QDebug> -#include <QtGui/QStatusBar> +#include <QStatusBar> namespace Core { diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index a66f9ec439..14cd5f38d3 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -35,8 +35,8 @@ #include "core_global.h" -#include <QtCore/QObject> -#include <QtCore/QSettings> +#include <QObject> +#include <QSettings> QT_BEGIN_NAMESPACE class QMainWindow; diff --git a/src/plugins/coreplugin/icorelistener.h b/src/plugins/coreplugin/icorelistener.h index f43508eb9a..5fb0093b65 100644 --- a/src/plugins/coreplugin/icorelistener.h +++ b/src/plugins/coreplugin/icorelistener.h @@ -34,7 +34,7 @@ #define ICORELISTENER_H #include "core_global.h" -#include <QtCore/QObject> +#include <QObject> namespace Core { class IEditor; diff --git a/src/plugins/coreplugin/id.cpp b/src/plugins/coreplugin/id.cpp index a03b4eb9d4..a394b3c618 100644 --- a/src/plugins/coreplugin/id.cpp +++ b/src/plugins/coreplugin/id.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QHash> +#include <QHash> namespace Core { diff --git a/src/plugins/coreplugin/id.h b/src/plugins/coreplugin/id.h index bc69fa9a10..9fc53773d4 100644 --- a/src/plugins/coreplugin/id.h +++ b/src/plugins/coreplugin/id.h @@ -35,8 +35,8 @@ #include "core_global.h" -#include <QtCore/QMetaType> -#include <QtCore/QString> +#include <QMetaType> +#include <QString> namespace Core { diff --git a/src/plugins/coreplugin/ifile.cpp b/src/plugins/coreplugin/ifile.cpp index f88d0c60fd..a6c72d51d1 100644 --- a/src/plugins/coreplugin/ifile.cpp +++ b/src/plugins/coreplugin/ifile.cpp @@ -34,8 +34,8 @@ #include "infobar.h" -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <QFile> +#include <QFileInfo> namespace Core { diff --git a/src/plugins/coreplugin/ifile.h b/src/plugins/coreplugin/ifile.h index 58baf35f59..8e097cb002 100644 --- a/src/plugins/coreplugin/ifile.h +++ b/src/plugins/coreplugin/ifile.h @@ -34,7 +34,7 @@ #define IFILE_H #include "core_global.h" -#include <QtCore/QObject> +#include <QObject> namespace Core { diff --git a/src/plugins/coreplugin/ifilefactory.h b/src/plugins/coreplugin/ifilefactory.h index 950ac3f74a..5a4e5f0b43 100644 --- a/src/plugins/coreplugin/ifilefactory.h +++ b/src/plugins/coreplugin/ifilefactory.h @@ -35,7 +35,7 @@ #include "core_global.h" -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QStringList; diff --git a/src/plugins/coreplugin/ifilewizardextension.h b/src/plugins/coreplugin/ifilewizardextension.h index a2c4ee80d8..0d0cf5cfc1 100644 --- a/src/plugins/coreplugin/ifilewizardextension.h +++ b/src/plugins/coreplugin/ifilewizardextension.h @@ -35,8 +35,8 @@ #include <coreplugin/core_global.h> -#include <QtCore/QObject> -#include <QtCore/QList> +#include <QObject> +#include <QList> QT_BEGIN_NAMESPACE class QWizardPage; diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h index c52df6f623..40b4871c93 100644 --- a/src/plugins/coreplugin/imode.h +++ b/src/plugins/coreplugin/imode.h @@ -35,7 +35,7 @@ #include "icontext.h" -#include <QtGui/QIcon> +#include <QIcon> namespace Core { diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp index 9dc272a839..9276d5754d 100644 --- a/src/plugins/coreplugin/inavigationwidgetfactory.cpp +++ b/src/plugins/coreplugin/inavigationwidgetfactory.cpp @@ -32,7 +32,7 @@ #include "inavigationwidgetfactory.h" -#include <QtGui/QKeySequence> +#include <QKeySequence> using namespace Core; diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h index 79595d4e25..5143f2ed8d 100644 --- a/src/plugins/coreplugin/inavigationwidgetfactory.h +++ b/src/plugins/coreplugin/inavigationwidgetfactory.h @@ -35,8 +35,8 @@ #include <coreplugin/id.h> -#include <QtCore/QObject> -#include <QtCore/QList> +#include <QObject> +#include <QList> QT_BEGIN_NAMESPACE class QToolButton; diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp index 505a43224f..f0e8e39b5f 100644 --- a/src/plugins/coreplugin/infobar.cpp +++ b/src/plugins/coreplugin/infobar.cpp @@ -34,12 +34,12 @@ #include <coreplugin/coreconstants.h> -#include <QtGui/QFrame> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> +#include <QFrame> +#include <QHBoxLayout> +#include <QLabel> +#include <QToolButton> -#include <QtCore/QVariant> +#include <QVariant> namespace Core { diff --git a/src/plugins/coreplugin/infobar.h b/src/plugins/coreplugin/infobar.h index 33b2d2d1e0..43be05cbf7 100644 --- a/src/plugins/coreplugin/infobar.h +++ b/src/plugins/coreplugin/infobar.h @@ -35,7 +35,7 @@ #include "core_global.h" -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QBoxLayout; diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h index cb3e7caece..bd73145866 100644 --- a/src/plugins/coreplugin/ioutputpane.h +++ b/src/plugins/coreplugin/ioutputpane.h @@ -35,9 +35,9 @@ #include "core_global.h" -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QObject> +#include <QList> +#include <QString> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h index 76b6b06fb8..622c6271fe 100644 --- a/src/plugins/coreplugin/iversioncontrol.h +++ b/src/plugins/coreplugin/iversioncontrol.h @@ -36,9 +36,9 @@ #include "core_global.h" #include "id.h" -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QFlags> +#include <QObject> +#include <QString> +#include <QFlags> namespace Core { diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index e753d0e539..b95c516191 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -85,28 +85,28 @@ #include <utils/stringutils.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QTimer> -#include <QtCore/QtPlugin> -#include <QtCore/QUrl> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QMimeData> - -#include <QtGui/QApplication> -#include <QtGui/QCloseEvent> -#include <QtGui/QMenu> -#include <QtGui/QPixmap> -#include <QtGui/QPrinter> -#include <QtGui/QShortcut> -#include <QtGui/QStatusBar> -#include <QtGui/QWizard> -#include <QtGui/QToolButton> -#include <QtGui/QMessageBox> -#include <QtGui/QMenuBar> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QFileInfo> +#include <QSettings> +#include <QTimer> +#include <QtPlugin> +#include <QUrl> +#include <QDir> +#include <QFile> +#include <QMimeData> + +#include <QApplication> +#include <QCloseEvent> +#include <QMenu> +#include <QPixmap> +#include <QPrinter> +#include <QShortcut> +#include <QStatusBar> +#include <QWizard> +#include <QToolButton> +#include <QMessageBox> +#include <QMenuBar> +#include <QPushButton> /* #ifdef Q_OS_UNIX diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 6234dc870b..5c1d3af945 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -37,8 +37,8 @@ #include "icontext.h" #include "icore.h" -#include <QtCore/QMap> -#include <QtGui/QColor> +#include <QMap> +#include <QColor> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 264c9e6203..03ab660f61 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -34,7 +34,7 @@ #include "styleanimator.h" -#include <QtCore/QLibrary> +#include <QLibrary> #include <coreplugin/coreconstants.h> @@ -43,27 +43,27 @@ #include <utils/fancymainwindow.h> -#include <QtGui/QApplication> -#include <QtGui/QComboBox> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QDockWidget> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMainWindow> -#include <QtGui/QMenuBar> -#include <QtGui/QPainter> -#include <QtGui/QPixmap> -#include <QtGui/QPixmapCache> -#include <QtGui/QPushButton> -#include <QtGui/QScrollArea> -#include <QtGui/QSplitter> -#include <QtGui/QStatusBar> -#include <QtGui/QStyleFactory> -#include <QtGui/QStyleOption> -#include <QtGui/QToolBar> -#include <QtGui/QTreeView> -#include <QtGui/QToolButton> -#include <QtGui/QAbstractItemView> +#include <QApplication> +#include <QComboBox> +#include <QDialogButtonBox> +#include <QDockWidget> +#include <QLabel> +#include <QLineEdit> +#include <QMainWindow> +#include <QMenuBar> +#include <QPainter> +#include <QPixmap> +#include <QPixmapCache> +#include <QPushButton> +#include <QScrollArea> +#include <QSplitter> +#include <QStatusBar> +#include <QStyleFactory> +#include <QStyleOption> +#include <QToolBar> +#include <QTreeView> +#include <QToolButton> +#include <QAbstractItemView> // We define a currently unused state for indicating animations #define State_Animating 0x00000040 diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h index ad804720c4..2d4a0df500 100644 --- a/src/plugins/coreplugin/manhattanstyle.h +++ b/src/plugins/coreplugin/manhattanstyle.h @@ -35,7 +35,7 @@ #include "core_global.h" -#include <QtGui/QProxyStyle> +#include <QProxyStyle> class ManhattanStylePrivate; diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp index 99340383a5..e340f9b68b 100644 --- a/src/plugins/coreplugin/messagemanager.cpp +++ b/src/plugins/coreplugin/messagemanager.cpp @@ -35,8 +35,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtGui/QStatusBar> -#include <QtGui/QApplication> +#include <QStatusBar> +#include <QApplication> using namespace Core; diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h index bea2d5d40d..434e700b11 100644 --- a/src/plugins/coreplugin/messagemanager.h +++ b/src/plugins/coreplugin/messagemanager.h @@ -34,7 +34,7 @@ #define MESSAGEMANAGER_H #include "core_global.h" -#include <QtCore/QObject> +#include <QObject> namespace Core { diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp index 9f47806f36..1b21323901 100644 --- a/src/plugins/coreplugin/messageoutputwindow.cpp +++ b/src/plugins/coreplugin/messageoutputwindow.cpp @@ -35,7 +35,7 @@ #include "icontext.h" #include "coreconstants.h" -#include <QtGui/QScrollBar> +#include <QScrollBar> using namespace Core::Internal; diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp index 7810cab9d7..e25cc77c59 100644 --- a/src/plugins/coreplugin/mimedatabase.cpp +++ b/src/plugins/coreplugin/mimedatabase.cpp @@ -36,24 +36,24 @@ #include <utils/qtcassert.h> -#include <QtCore/QByteArray> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QLocale> -#include <QtCore/QMap> -#include <QtCore/QHash> -#include <QtCore/QMultiHash> -#include <QtCore/QRegExp> -#include <QtCore/QSharedData> -#include <QtCore/QSharedPointer> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> -#include <QtCore/QMutexLocker> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> +#include <QByteArray> +#include <QCoreApplication> +#include <QDebug> +#include <QFile> +#include <QDir> +#include <QFileInfo> +#include <QLocale> +#include <QMap> +#include <QHash> +#include <QMultiHash> +#include <QRegExp> +#include <QSharedData> +#include <QSharedPointer> +#include <QStringList> +#include <QTextStream> +#include <QMutexLocker> +#include <QXmlStreamReader> +#include <QXmlStreamWriter> #include <algorithm> #include <functional> diff --git a/src/plugins/coreplugin/mimedatabase.h b/src/plugins/coreplugin/mimedatabase.h index dfd74c395b..ff5fc62cec 100644 --- a/src/plugins/coreplugin/mimedatabase.h +++ b/src/plugins/coreplugin/mimedatabase.h @@ -34,13 +34,13 @@ #define MIMEDATABASE_H #include <coreplugin/core_global.h> -#include <QtCore/QStringList> -#include <QtCore/QSharedDataPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QByteArray> -#include <QtCore/QMutex> -#include <QtCore/QFileInfo> -#include <QtCore/QPair> +#include <QStringList> +#include <QSharedDataPointer> +#include <QSharedPointer> +#include <QByteArray> +#include <QMutex> +#include <QFileInfo> +#include <QPair> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/plugins/coreplugin/mimetypemagicdialog.cpp b/src/plugins/coreplugin/mimetypemagicdialog.cpp index ae5ed07641..da9ca8db14 100644 --- a/src/plugins/coreplugin/mimetypemagicdialog.cpp +++ b/src/plugins/coreplugin/mimetypemagicdialog.cpp @@ -33,8 +33,8 @@ #include "mimetypemagicdialog.h" #include "mimedatabase.h" -#include <QtCore/QLatin1String> -#include <QtGui/QMessageBox> +#include <QLatin1String> +#include <QMessageBox> using namespace Core; using namespace Internal; diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index c6a83f2198..ad3d833f4b 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -42,17 +42,17 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QLatin1String> -#include <QtCore/QStringList> -#include <QtCore/QVector> -#include <QtCore/QSet> -#include <QtCore/QScopedPointer> -#include <QtCore/QAbstractTableModel> -#include <QtCore/QHash> -#include <QtGui/QIcon> -#include <QtGui/QTableWidgetItem> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QLatin1String> +#include <QStringList> +#include <QVector> +#include <QSet> +#include <QScopedPointer> +#include <QAbstractTableModel> +#include <QHash> +#include <QIcon> +#include <QTableWidgetItem> +#include <QMessageBox> #include <QtAlgorithms> #include <algorithm> diff --git a/src/plugins/coreplugin/minisplitter.cpp b/src/plugins/coreplugin/minisplitter.cpp index 93e1669245..8c47eae189 100644 --- a/src/plugins/coreplugin/minisplitter.cpp +++ b/src/plugins/coreplugin/minisplitter.cpp @@ -34,9 +34,9 @@ #include <utils/stylehelper.h> -#include <QtGui/QPaintEvent> -#include <QtGui/QPainter> -#include <QtGui/QSplitterHandle> +#include <QPaintEvent> +#include <QPainter> +#include <QSplitterHandle> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/minisplitter.h b/src/plugins/coreplugin/minisplitter.h index 6fee59a450..f661a2483e 100644 --- a/src/plugins/coreplugin/minisplitter.h +++ b/src/plugins/coreplugin/minisplitter.h @@ -35,7 +35,7 @@ #include "core_global.h" -#include <QtGui/QSplitter> +#include <QSplitter> QT_BEGIN_NAMESPACE class QSplitterHandle; diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index ed96cbaeee..b8d664f47e 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -49,14 +49,14 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QVector> - -#include <QtCore/QSignalMapper> -#include <QtGui/QShortcut> -#include <QtGui/QAction> +#include <QDebug> +#include <QList> +#include <QMap> +#include <QVector> + +#include <QSignalMapper> +#include <QShortcut> +#include <QAction> namespace Core { diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index 9f7cfac9e3..cb4433ed45 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/src/plugins/coreplugin/modemanager.h @@ -33,7 +33,7 @@ #ifndef MODEMANAGER_H #define MODEMANAGER_H -#include <QtCore/QObject> +#include <QObject> #include <coreplugin/core_global.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp index 88fcb65ef4..96d69f06c5 100644 --- a/src/plugins/coreplugin/navigationsubwidget.cpp +++ b/src/plugins/coreplugin/navigationsubwidget.cpp @@ -46,15 +46,15 @@ #include <utils/styledbar.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> - -#include <QtGui/QAction> -#include <QtGui/QHBoxLayout> -#include <QtGui/QResizeEvent> -#include <QtGui/QToolButton> -#include <QtGui/QShortcut> -#include <QtGui/QStandardItemModel> +#include <QDebug> +#include <QSettings> + +#include <QAction> +#include <QHBoxLayout> +#include <QResizeEvent> +#include <QToolButton> +#include <QShortcut> +#include <QStandardItemModel> Q_DECLARE_METATYPE(Core::INavigationWidgetFactory *) diff --git a/src/plugins/coreplugin/navigationsubwidget.h b/src/plugins/coreplugin/navigationsubwidget.h index de44a834e2..c43e60656b 100644 --- a/src/plugins/coreplugin/navigationsubwidget.h +++ b/src/plugins/coreplugin/navigationsubwidget.h @@ -33,9 +33,9 @@ #ifndef NAVIGATIONSSUBWIDGET_H #define NAVIGATIONSSUBWIDGET_H -#include <QtGui/QComboBox> +#include <QComboBox> -#include <QtCore/QList> +#include <QList> QT_BEGIN_NAMESPACE class QToolButton; diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 6c007b422d..4c909dd445 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -45,15 +45,15 @@ #include <utils/styledbar.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> - -#include <QtGui/QAction> -#include <QtGui/QHBoxLayout> -#include <QtGui/QResizeEvent> -#include <QtGui/QToolButton> -#include <QtGui/QShortcut> -#include <QtGui/QStandardItemModel> +#include <QDebug> +#include <QSettings> + +#include <QAction> +#include <QHBoxLayout> +#include <QResizeEvent> +#include <QToolButton> +#include <QShortcut> +#include <QStandardItemModel> Q_DECLARE_METATYPE(Core::INavigationWidgetFactory *) diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index 027077ec86..d5d75de3cc 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/src/plugins/coreplugin/navigationwidget.h @@ -36,7 +36,7 @@ #include <coreplugin/minisplitter.h> #include <coreplugin/id.h> -#include <QtCore/QHash> +#include <QHash> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index 5d2c9f837f..b22ae99e55 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -38,8 +38,8 @@ #include "ioutputpane.h" #include "modemanager.h" -#include <QtGui/QSplitter> -#include <QtGui/QVBoxLayout> +#include <QSplitter> +#include <QVBoxLayout> namespace Core { diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h index a923b1e25a..945afb4d42 100644 --- a/src/plugins/coreplugin/outputpane.h +++ b/src/plugins/coreplugin/outputpane.h @@ -35,7 +35,7 @@ #include "core_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QSplitter; diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index eb21bac96f..e869c3366f 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -54,18 +54,18 @@ #include <utils/styledbar.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QComboBox> -#include <QtGui/QFocusEvent> -#include <QtGui/QHBoxLayout> -#include <QtGui/QSplitter> -#include <QtGui/QPainter> -#include <QtGui/QToolButton> -#include <QtGui/QStackedWidget> -#include <QtGui/QMenu> +#include <QDebug> + +#include <QAction> +#include <QApplication> +#include <QComboBox> +#include <QFocusEvent> +#include <QHBoxLayout> +#include <QSplitter> +#include <QPainter> +#include <QToolButton> +#include <QStackedWidget> +#include <QMenu> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h index df1d2feb7b..d507cf1f77 100644 --- a/src/plugins/coreplugin/outputpanemanager.h +++ b/src/plugins/coreplugin/outputpanemanager.h @@ -33,8 +33,8 @@ #ifndef OUTPUTPANEMANAGER_H #define OUTPUTPANEMANAGER_H -#include <QtCore/QMap> -#include <QtGui/QToolButton> +#include <QMap> +#include <QToolButton> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index b6795c2549..6990fe72f6 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -40,8 +40,8 @@ #include <utils/qtcassert.h> #include <utils/outputformatter.h> -#include <QtGui/QAction> -#include <QtGui/QScrollBar> +#include <QAction> +#include <QScrollBar> using namespace Utils; diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h index 2cc361f349..3864226416 100644 --- a/src/plugins/coreplugin/outputwindow.h +++ b/src/plugins/coreplugin/outputwindow.h @@ -38,7 +38,7 @@ #include <utils/outputformatter.h> -#include <QtGui/QPlainTextEdit> +#include <QPlainTextEdit> namespace Core { diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp index dab2664a7f..6d3ad9eb81 100644 --- a/src/plugins/coreplugin/plugindialog.cpp +++ b/src/plugins/coreplugin/plugindialog.cpp @@ -38,12 +38,12 @@ #include <extensionsystem/pluginerrorview.h> #include <extensionsystem/pluginspec.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QPushButton> -#include <QtGui/QLabel> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QDialog> +#include <QDialogButtonBox> +#include <QPushButton> +#include <QLabel> #include <QtDebug> using namespace Core::Internal; diff --git a/src/plugins/coreplugin/plugindialog.h b/src/plugins/coreplugin/plugindialog.h index aef689c0d3..bd87c17cc7 100644 --- a/src/plugins/coreplugin/plugindialog.h +++ b/src/plugins/coreplugin/plugindialog.h @@ -33,7 +33,7 @@ #ifndef PLUGINDIALOG_H #define PLUGINDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QPushButton; diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp index 2e92ea98ea..36102d4d8f 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp +++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp @@ -33,19 +33,19 @@ #include "futureprogress.h" #include "progressbar.h" -#include <QtCore/QFutureWatcher> -#include <QtCore/QTimer> -#include <QtCore/QCoreApplication> -#include <QtCore/QPropertyAnimation> -#include <QtCore/QSequentialAnimationGroup> - -#include <QtGui/QColor> -#include <QtGui/QVBoxLayout> -#include <QtGui/QMenu> -#include <QtGui/QProgressBar> -#include <QtGui/QHBoxLayout> -#include <QtGui/QPainter> -#include <QtGui/QMouseEvent> +#include <QFutureWatcher> +#include <QTimer> +#include <QCoreApplication> +#include <QPropertyAnimation> +#include <QSequentialAnimationGroup> + +#include <QColor> +#include <QVBoxLayout> +#include <QMenu> +#include <QProgressBar> +#include <QHBoxLayout> +#include <QPainter> +#include <QMouseEvent> #include <utils/stylehelper.h> const int notificationTimeout = 8000; diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h index 64a27a6737..1349b06e64 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.h +++ b/src/plugins/coreplugin/progressmanager/futureprogress.h @@ -35,9 +35,9 @@ #include <coreplugin/core_global.h> -#include <QtCore/QString> -#include <QtCore/QFuture> -#include <QtGui/QWidget> +#include <QString> +#include <QFuture> +#include <QWidget> namespace Core { struct FutureProgressPrivate; diff --git a/src/plugins/coreplugin/progressmanager/progressbar.cpp b/src/plugins/coreplugin/progressmanager/progressbar.cpp index 20c3fce943..8e457840e8 100644 --- a/src/plugins/coreplugin/progressmanager/progressbar.cpp +++ b/src/plugins/coreplugin/progressmanager/progressbar.cpp @@ -34,12 +34,12 @@ #include <utils/stylehelper.h> -#include <QtCore/QPropertyAnimation> -#include <QtGui/QPainter> -#include <QtGui/QFont> -#include <QtGui/QBrush> -#include <QtGui/QColor> -#include <QtGui/QMouseEvent> +#include <QPropertyAnimation> +#include <QPainter> +#include <QFont> +#include <QBrush> +#include <QColor> +#include <QMouseEvent> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/progressmanager/progressbar.h b/src/plugins/coreplugin/progressmanager/progressbar.h index 2a736f7546..5e14bc7faf 100644 --- a/src/plugins/coreplugin/progressmanager/progressbar.h +++ b/src/plugins/coreplugin/progressmanager/progressbar.h @@ -33,8 +33,8 @@ #ifndef PROGRESSPIE_H #define PROGRESSPIE_H -#include <QtCore/QString> -#include <QtGui/QWidget> +#include <QString> +#include <QWidget> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index 2fb6e44ea4..2a7e86e0a6 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -35,8 +35,8 @@ #include <coreplugin/core_global.h> -#include <QtCore/QObject> -#include <QtCore/QFuture> +#include <QObject> +#include <QFuture> namespace Core { class FutureProgress; diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_p.h b/src/plugins/coreplugin/progressmanager/progressmanager_p.h index 3a76b5dd4e..3869fe8ef9 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_p.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager_p.h @@ -35,9 +35,9 @@ #include "progressmanager.h" -#include <QtCore/QPointer> -#include <QtCore/QList> -#include <QtCore/QFutureWatcher> +#include <QPointer> +#include <QList> +#include <QFutureWatcher> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp index cc2d841a3e..e634d1db10 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp @@ -30,18 +30,18 @@ ** **************************************************************************/ -#include <QtCore/QVariant> -#include <QtGui/QMainWindow> -#include <QtGui/QFont> -#include <QtGui/QFontMetrics> -#include <QtGui/QPixmap> -#include <QtGui/QPainter> +#include <QVariant> +#include <QMainWindow> +#include <QFont> +#include <QFontMetrics> +#include <QPixmap> +#include <QPainter> #if QT_VERSION >= 0x050000 -# include <QtGui/QGuiApplication> -# include <QtGui/QWindow> -# include <QtGui/QPlatformNativeInterface> +# include <QGuiApplication> +# include <QWindow> +# include <QPlatformNativeInterface> #endif -#include <QtGui/QLabel> +#include <QLabel> #include <coreplugin/icore.h> diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp index 9d63d95862..19b2c8688a 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.cpp +++ b/src/plugins/coreplugin/progressmanager/progressview.cpp @@ -35,8 +35,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> +#include <QHBoxLayout> +#include <QVBoxLayout> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/progressmanager/progressview.h b/src/plugins/coreplugin/progressmanager/progressview.h index 7b7298ad5e..c8e38fc649 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.h +++ b/src/plugins/coreplugin/progressmanager/progressview.h @@ -35,8 +35,8 @@ #include "progressmanager.h" -#include <QtCore/QFuture> -#include <QtGui/QWidget> +#include <QFuture> +#include <QWidget> QT_BEGIN_NAMESPACE class QVBoxLayout; diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp index abccf70f9a..1d4617f2ab 100644 --- a/src/plugins/coreplugin/rightpane.cpp +++ b/src/plugins/coreplugin/rightpane.cpp @@ -34,12 +34,12 @@ #include <coreplugin/modemanager.h> -#include <QtCore/QSettings> +#include <QSettings> -#include <QtGui/QVBoxLayout> -#include <QtGui/QSplitter> -#include <QtGui/QResizeEvent> -#include <QtGui/QTextEdit> +#include <QVBoxLayout> +#include <QSplitter> +#include <QResizeEvent> +#include <QTextEdit> using namespace Core; diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h index cf3ec92eeb..a2d2fefd7a 100644 --- a/src/plugins/coreplugin/rightpane.h +++ b/src/plugins/coreplugin/rightpane.h @@ -35,8 +35,8 @@ #include "core_global.h" -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h index fc41228416..6126337f99 100644 --- a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h +++ b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h @@ -40,8 +40,8 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> -#include <QtCore/QList> -#include <QtCore/QMetaType> +#include <QList> +#include <QMetaType> QT_BEGIN_NAMESPACE class QMainWindow; diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp index 667178c800..bbf802717a 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp +++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp @@ -39,14 +39,14 @@ #include <limits.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtGui/QMessageBox> -#include <QtGui/QInputDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> -#include <QtGui/QToolBar> -#include <QtGui/QStatusBar> +#include <QDebug> +#include <QSettings> +#include <QMessageBox> +#include <QInputDialog> +#include <QFileDialog> +#include <QMainWindow> +#include <QToolBar> +#include <QStatusBar> // Script function template to pop up a message box // with a certain icon and buttons. diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.h b/src/plugins/coreplugin/scriptmanager/scriptmanager.h index 902c65e05f..f38edb0254 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanager.h +++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.h @@ -35,9 +35,9 @@ #include <coreplugin/core_global.h> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QString> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QScriptEngine; diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h index d5c800ccfe..be8e2354f5 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h +++ b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h @@ -35,8 +35,8 @@ #include "scriptmanager.h" -#include <QtCore/QObject> -#include <QtScript/QScriptEngine> +#include <QObject> +#include <QScriptEngine> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/settingsdatabase.cpp b/src/plugins/coreplugin/settingsdatabase.cpp index 12c3b02dda..900f8f80f5 100644 --- a/src/plugins/coreplugin/settingsdatabase.cpp +++ b/src/plugins/coreplugin/settingsdatabase.cpp @@ -32,16 +32,16 @@ #include "settingsdatabase.h" -#include <QtCore/QDir> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> - -#include <QtSql/QSqlDatabase> -#include <QtSql/QSqlError> -#include <QtSql/QSqlQuery> -#include <QtCore/QDebug> +#include <QDir> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> + +#include <QSqlDatabase> +#include <QSqlError> +#include <QSqlQuery> +#include <QDebug> /*! \class Core::SettingsDatabase diff --git a/src/plugins/coreplugin/settingsdatabase.h b/src/plugins/coreplugin/settingsdatabase.h index 8240ed56da..816a306c7a 100644 --- a/src/plugins/coreplugin/settingsdatabase.h +++ b/src/plugins/coreplugin/settingsdatabase.h @@ -35,10 +35,10 @@ #include "core_global.h" -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QObject> +#include <QString> +#include <QStringList> +#include <QVariant> namespace Core { diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index bbc07249c6..2b2282dc57 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -39,12 +39,12 @@ #include "actionmanager/actionmanager.h" #include "actionmanager/command.h" -#include <QtCore/QEvent> -#include <QtCore/QSettings> -#include <QtGui/QLayout> -#include <QtGui/QToolBar> -#include <QtGui/QAction> -#include <QtGui/QToolButton> +#include <QEvent> +#include <QSettings> +#include <QLayout> +#include <QToolBar> +#include <QAction> +#include <QToolButton> namespace Core { diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h index d6606acb95..fac8c5ba6a 100644 --- a/src/plugins/coreplugin/sidebar.h +++ b/src/plugins/coreplugin/sidebar.h @@ -36,8 +36,8 @@ #include "core_global.h" #include "minisplitter.h" -#include <QtCore/QMap> -#include <QtCore/QList> +#include <QMap> +#include <QList> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp index 93f8b5ca47..1c19c2f9cc 100644 --- a/src/plugins/coreplugin/sidebarwidget.cpp +++ b/src/plugins/coreplugin/sidebarwidget.cpp @@ -36,10 +36,10 @@ #include <coreplugin/coreconstants.h> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QAction> -#include <QtGui/QVBoxLayout> +#include <QToolBar> +#include <QToolButton> +#include <QAction> +#include <QVBoxLayout> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/sidebarwidget.h b/src/plugins/coreplugin/sidebarwidget.h index f72e7f7b11..67c7d93c97 100644 --- a/src/plugins/coreplugin/sidebarwidget.h +++ b/src/plugins/coreplugin/sidebarwidget.h @@ -33,7 +33,7 @@ #ifndef SIDEBARWIDGET_H #define SIDEBARWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp index 9c8d89cebb..6948170686 100644 --- a/src/plugins/coreplugin/statusbarmanager.cpp +++ b/src/plugins/coreplugin/statusbarmanager.cpp @@ -41,10 +41,10 @@ #include <aggregation/aggregate.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QSettings> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QStatusBar> +#include <QSettings> +#include <QHBoxLayout> +#include <QLabel> +#include <QStatusBar> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/statusbarmanager.h b/src/plugins/coreplugin/statusbarmanager.h index 6ed623ff3f..8f978ac2d3 100644 --- a/src/plugins/coreplugin/statusbarmanager.h +++ b/src/plugins/coreplugin/statusbarmanager.h @@ -33,8 +33,8 @@ #ifndef STATUSBARMANAGER_H #define STATUSBARMANAGER_H -#include <QtCore/QObject> -#include <QtCore/QList> +#include <QObject> +#include <QList> QT_FORWARD_DECLARE_CLASS(QWidget) diff --git a/src/plugins/coreplugin/statusbarwidget.cpp b/src/plugins/coreplugin/statusbarwidget.cpp index 7262eafc3c..bb64c2b780 100644 --- a/src/plugins/coreplugin/statusbarwidget.cpp +++ b/src/plugins/coreplugin/statusbarwidget.cpp @@ -32,7 +32,7 @@ #include "statusbarwidget.h" -#include <QtGui/QWidget> +#include <QWidget> using namespace Core; diff --git a/src/plugins/coreplugin/statusbarwidget.h b/src/plugins/coreplugin/statusbarwidget.h index 0fc2ee5004..c913a794f3 100644 --- a/src/plugins/coreplugin/statusbarwidget.h +++ b/src/plugins/coreplugin/statusbarwidget.h @@ -35,7 +35,7 @@ #include "core_global.h" #include "icontext.h" -#include <QtCore/QPointer> +#include <QPointer> namespace Core { diff --git a/src/plugins/coreplugin/styleanimator.cpp b/src/plugins/coreplugin/styleanimator.cpp index ff4652dae8..0c896f9845 100644 --- a/src/plugins/coreplugin/styleanimator.cpp +++ b/src/plugins/coreplugin/styleanimator.cpp @@ -32,7 +32,7 @@ #include "styleanimator.h" -#include <QtGui/QStyleOption> +#include <QStyleOption> Animation * StyleAnimator::widgetAnimation(const QWidget *widget) const { diff --git a/src/plugins/coreplugin/styleanimator.h b/src/plugins/coreplugin/styleanimator.h index 104c4ac75f..ee925f7e75 100644 --- a/src/plugins/coreplugin/styleanimator.h +++ b/src/plugins/coreplugin/styleanimator.h @@ -33,12 +33,12 @@ #ifndef ANIMATION_H #define ANIMATION_H -#include <QtCore/QPointer> -#include <QtCore/QTime> -#include <QtCore/QBasicTimer> -#include <QtGui/QStyle> -#include <QtGui/QPainter> -#include <QtGui/QWidget> +#include <QPointer> +#include <QTime> +#include <QBasicTimer> +#include <QStyle> +#include <QPainter> +#include <QWidget> /* * This is a set of helper classes to allow for widget animations in diff --git a/src/plugins/coreplugin/tabpositionindicator.cpp b/src/plugins/coreplugin/tabpositionindicator.cpp index 167a389586..d62d6e11dd 100644 --- a/src/plugins/coreplugin/tabpositionindicator.cpp +++ b/src/plugins/coreplugin/tabpositionindicator.cpp @@ -32,10 +32,10 @@ #include "tabpositionindicator.h" -#include <QtGui/QPainter> -#include <QtGui/QPaintEvent> -#include <QtGui/QBrush> -#include <QtGui/QPalette> +#include <QPainter> +#include <QPaintEvent> +#include <QBrush> +#include <QPalette> using namespace Core::Internal; diff --git a/src/plugins/coreplugin/tabpositionindicator.h b/src/plugins/coreplugin/tabpositionindicator.h index 92025eeb96..372b342a43 100644 --- a/src/plugins/coreplugin/tabpositionindicator.h +++ b/src/plugins/coreplugin/tabpositionindicator.h @@ -33,7 +33,7 @@ #ifndef TABPOSITIONINDICATOR_H #define TABPOSITIONINDICATOR_H -#include <QtGui/QWidget> +#include <QWidget> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/textfile.cpp b/src/plugins/coreplugin/textfile.cpp index c1dd793d37..54c64a8483 100644 --- a/src/plugins/coreplugin/textfile.cpp +++ b/src/plugins/coreplugin/textfile.cpp @@ -33,8 +33,8 @@ #include "textfile.h" #include "editormanager.h" -#include <QtCore/QDebug> -#include <QtCore/QTextCodec> +#include <QDebug> +#include <QTextCodec> /*! \class Core::TextFile diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp index f96ec6edae..b8baf32947 100644 --- a/src/plugins/coreplugin/toolsettings.cpp +++ b/src/plugins/coreplugin/toolsettings.cpp @@ -39,11 +39,11 @@ #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QTime> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QFileInfo> +#include <QDir> +#include <QTime> +#include <QIcon> #include <QtDebug> diff --git a/src/plugins/coreplugin/toolsettings.h b/src/plugins/coreplugin/toolsettings.h index f65ada2070..aa5d79e01c 100644 --- a/src/plugins/coreplugin/toolsettings.h +++ b/src/plugins/coreplugin/toolsettings.h @@ -35,7 +35,7 @@ #include "ioptionspage.h" -#include <QtCore/QPointer> +#include <QPointer> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/variablechooser.cpp b/src/plugins/coreplugin/variablechooser.cpp index 546b0d58fd..02dd359cde 100644 --- a/src/plugins/coreplugin/variablechooser.cpp +++ b/src/plugins/coreplugin/variablechooser.cpp @@ -37,11 +37,11 @@ #include <utils/fancylineedit.h> // IconButton -#include <QtCore/QTimer> -#include <QtGui/QLineEdit> -#include <QtGui/QTextEdit> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QListWidgetItem> +#include <QTimer> +#include <QLineEdit> +#include <QTextEdit> +#include <QPlainTextEdit> +#include <QListWidgetItem> using namespace Core; diff --git a/src/plugins/coreplugin/variablechooser.h b/src/plugins/coreplugin/variablechooser.h index 23905533a7..5599e2fe12 100644 --- a/src/plugins/coreplugin/variablechooser.h +++ b/src/plugins/coreplugin/variablechooser.h @@ -35,8 +35,8 @@ #include "core_global.h" -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QPointer> +#include <QWidget> QT_BEGIN_NAMESPACE class QLineEdit; diff --git a/src/plugins/coreplugin/variablemanager.cpp b/src/plugins/coreplugin/variablemanager.cpp index df407974da..20c40bfa5e 100644 --- a/src/plugins/coreplugin/variablemanager.cpp +++ b/src/plugins/coreplugin/variablemanager.cpp @@ -38,10 +38,10 @@ #include <utils/stringutils.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QObject> -#include <QtCore/QMap> -#include <QtCore/QDebug> +#include <QFileInfo> +#include <QObject> +#include <QMap> +#include <QDebug> namespace Core { diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h index 0fcef56838..f2daf4b1b7 100644 --- a/src/plugins/coreplugin/variablemanager.h +++ b/src/plugins/coreplugin/variablemanager.h @@ -35,8 +35,8 @@ #include "core_global.h" -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> namespace Utils { class AbstractMacroExpander; diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 2b26d76c20..cd9a33f47e 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -38,14 +38,14 @@ #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QCoreApplication> - -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> +#include <QDir> +#include <QString> +#include <QList> +#include <QMap> +#include <QCoreApplication> + +#include <QFileInfo> +#include <QMessageBox> namespace Core { diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h index 304a25f6e5..7e78050b13 100644 --- a/src/plugins/coreplugin/vcsmanager.h +++ b/src/plugins/coreplugin/vcsmanager.h @@ -35,8 +35,8 @@ #include "core_global.h" -#include <QtCore/QString> -#include <QtCore/QObject> +#include <QString> +#include <QObject> namespace Core { diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 8484932c54..8e693ea2ea 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -37,15 +37,15 @@ #include <coreplugin/coreconstants.h> #include <utils/qtcassert.h> -#include <QtCore/QDate> -#include <QtCore/QFile> -#include <QtCore/QSysInfo> +#include <QDate> +#include <QFile> +#include <QSysInfo> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QTextBrowser> +#include <QDialogButtonBox> +#include <QGridLayout> +#include <QLabel> +#include <QPushButton> +#include <QTextBrowser> using namespace Core; using namespace Core::Internal; diff --git a/src/plugins/coreplugin/versiondialog.h b/src/plugins/coreplugin/versiondialog.h index bd608ac87c..e8c1eb613c 100644 --- a/src/plugins/coreplugin/versiondialog.h +++ b/src/plugins/coreplugin/versiondialog.h @@ -33,7 +33,7 @@ #ifndef VERSIONDIALOG_H #define VERSIONDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace Core { namespace Internal { diff --git a/src/plugins/cpaster/codepasterprotocol.cpp b/src/plugins/cpaster/codepasterprotocol.cpp index 91b6489411..2d720e872f 100644 --- a/src/plugins/cpaster/codepasterprotocol.cpp +++ b/src/plugins/cpaster/codepasterprotocol.cpp @@ -42,9 +42,9 @@ #include <utils/qtcassert.h> -#include <QtGui/QListWidget> -#include <QtNetwork/QNetworkReply> -#include <QtCore/QDebug> +#include <QListWidget> +#include <QNetworkReply> +#include <QDebug> enum { debug = 0 }; diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp index 2dce06eca8..2ae6d1fbc1 100644 --- a/src/plugins/cpaster/codepastersettings.cpp +++ b/src/plugins/cpaster/codepastersettings.cpp @@ -35,17 +35,17 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> -#include <QtGui/QLineEdit> -#include <QtGui/QFileDialog> -#include <QtGui/QGroupBox> -#include <QtGui/QFormLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QIcon> -#include <QtCore/QDebug> -#include <QtCore/QVariant> +#include <QSettings> +#include <QCoreApplication> +#include <QLineEdit> +#include <QFileDialog> +#include <QGroupBox> +#include <QFormLayout> +#include <QVBoxLayout> +#include <QLabel> +#include <QIcon> +#include <QDebug> +#include <QVariant> static const char settingsGroupC[] = "CodePasterSettings"; static const char serverKeyC[] = "Server"; diff --git a/src/plugins/cpaster/columnindicatortextedit.cpp b/src/plugins/cpaster/columnindicatortextedit.cpp index d5ac629ca1..9af09b002d 100644 --- a/src/plugins/cpaster/columnindicatortextedit.cpp +++ b/src/plugins/cpaster/columnindicatortextedit.cpp @@ -32,8 +32,8 @@ #include "columnindicatortextedit.h" -#include <QtGui/QPainter> -#include <QtGui/QScrollBar> +#include <QPainter> +#include <QScrollBar> namespace CodePaster { diff --git a/src/plugins/cpaster/columnindicatortextedit.h b/src/plugins/cpaster/columnindicatortextedit.h index f89c728d8d..9024bd2379 100644 --- a/src/plugins/cpaster/columnindicatortextedit.h +++ b/src/plugins/cpaster/columnindicatortextedit.h @@ -33,7 +33,7 @@ #ifndef COLUMNINDICATORTEXTEDIT_H #define COLUMNINDICATORTEXTEDIT_H -#include <QtGui/QTextEdit> +#include <QTextEdit> namespace CodePaster { diff --git a/src/plugins/cpaster/cpasterconstants.h b/src/plugins/cpaster/cpasterconstants.h index b8890480d6..798ff73154 100644 --- a/src/plugins/cpaster/cpasterconstants.h +++ b/src/plugins/cpaster/cpasterconstants.h @@ -33,7 +33,7 @@ #ifndef CPASTERCONSTANTS_H #define CPASTERCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace CodePaster { namespace Constants { diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 8c527d7a7b..360b3574e8 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -56,16 +56,16 @@ #include <utils/fileutils.h> #include <texteditor/basetexteditor.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTemporaryFile> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QMenu> -#include <QtGui/QMainWindow> +#include <QtPlugin> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTemporaryFile> +#include <QAction> +#include <QApplication> +#include <QClipboard> +#include <QMenu> +#include <QMainWindow> using namespace Core; using namespace TextEditor; diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h index 065960a1e4..4b50faa91c 100644 --- a/src/plugins/cpaster/cpasterplugin.h +++ b/src/plugins/cpaster/cpasterplugin.h @@ -35,8 +35,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> +#include <QStringList> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/cpaster/fileshareprotocol.cpp b/src/plugins/cpaster/fileshareprotocol.cpp index 92985ac6f0..376559041f 100644 --- a/src/plugins/cpaster/fileshareprotocol.cpp +++ b/src/plugins/cpaster/fileshareprotocol.cpp @@ -40,12 +40,12 @@ #include <utils/qtcassert.h> #include <utils/fileutils.h> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttribute> -#include <QtCore/QTemporaryFile> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QXmlStreamReader> +#include <QXmlStreamAttribute> +#include <QTemporaryFile> +#include <QDir> +#include <QFileInfo> +#include <QDebug> enum { debug = 0 }; diff --git a/src/plugins/cpaster/fileshareprotocol.h b/src/plugins/cpaster/fileshareprotocol.h index 82a99832f0..3fb32973fa 100644 --- a/src/plugins/cpaster/fileshareprotocol.h +++ b/src/plugins/cpaster/fileshareprotocol.h @@ -35,7 +35,7 @@ #include "protocol.h" -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace CodePaster { diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp index 68e752979c..028ef9387f 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp @@ -35,9 +35,9 @@ #include <coreplugin/icore.h> -#include <QtCore/QDir> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QSettings> +#include <QCoreApplication> static const char settingsGroupC[] = "FileSharePasterSettings"; static const char pathKeyC[] = "Path"; diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.h b/src/plugins/cpaster/fileshareprotocolsettingspage.h index 35ba8fd0f1..cccd85acb6 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.h +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.h @@ -36,9 +36,9 @@ #include <coreplugin/dialogs/ioptionspage.h> #include "ui_fileshareprotocolsettingswidget.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QSharedPointer> +#include <QPointer> +#include <QWidget> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cpaster/kdepasteprotocol.cpp b/src/plugins/cpaster/kdepasteprotocol.cpp index b24efe3b55..00ac696025 100644 --- a/src/plugins/cpaster/kdepasteprotocol.cpp +++ b/src/plugins/cpaster/kdepasteprotocol.cpp @@ -34,13 +34,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QByteArray> -#include <QtCore/QStringList> +#include <QDebug> +#include <QTextStream> +#include <QXmlStreamReader> +#include <QByteArray> +#include <QStringList> -#include <QtNetwork/QNetworkReply> +#include <QNetworkReply> enum { debug = 0 }; diff --git a/src/plugins/cpaster/pastebindotcaprotocol.cpp b/src/plugins/cpaster/pastebindotcaprotocol.cpp index af8da970e8..650aed03e1 100644 --- a/src/plugins/cpaster/pastebindotcaprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcaprotocol.cpp @@ -34,10 +34,10 @@ #include <utils/qtcassert.h> -#include <QtNetwork/QNetworkReply> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QStringList> +#include <QNetworkReply> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QStringList> static const char urlC[] = "http://pastebin.ca/"; diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp index 1df4ca28e0..6edaa7c69b 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp @@ -37,13 +37,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QByteArray> +#include <QDebug> +#include <QTextStream> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QByteArray> -#include <QtNetwork/QNetworkReply> +#include <QNetworkReply> enum { debug = 0 }; diff --git a/src/plugins/cpaster/pastebindotcomsettings.cpp b/src/plugins/cpaster/pastebindotcomsettings.cpp index d2205059a5..f3d47bb782 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.cpp +++ b/src/plugins/cpaster/pastebindotcomsettings.cpp @@ -35,8 +35,8 @@ #include "ui_pastebindotcomsettings.h" #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> +#include <QSettings> +#include <QCoreApplication> static const char groupC[] = "PasteBinDotComSettings"; static const char prefixKeyC[] = "Prefix"; diff --git a/src/plugins/cpaster/pastebindotcomsettings.h b/src/plugins/cpaster/pastebindotcomsettings.h index 04059f5f62..c66574f4ed 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.h +++ b/src/plugins/cpaster/pastebindotcomsettings.h @@ -35,9 +35,9 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QStringList> -#include <QtCore/QUrl> -#include <QtGui/QWidget> +#include <QStringList> +#include <QUrl> +#include <QWidget> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cpaster/pasteselectdialog.cpp b/src/plugins/cpaster/pasteselectdialog.cpp index 0a5a7a67dd..07df5dd911 100644 --- a/src/plugins/cpaster/pasteselectdialog.cpp +++ b/src/plugins/cpaster/pasteselectdialog.cpp @@ -35,8 +35,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QPushButton> namespace CodePaster { diff --git a/src/plugins/cpaster/pasteselectdialog.h b/src/plugins/cpaster/pasteselectdialog.h index f3ba197f74..5492d7b2be 100644 --- a/src/plugins/cpaster/pasteselectdialog.h +++ b/src/plugins/cpaster/pasteselectdialog.h @@ -35,7 +35,7 @@ #include "ui_pasteselect.h" -#include <QtCore/QList> +#include <QList> QT_FORWARD_DECLARE_CLASS(QPushButton) diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp index d05aa34320..524b3d7f8a 100644 --- a/src/plugins/cpaster/pasteview.cpp +++ b/src/plugins/cpaster/pasteview.cpp @@ -35,12 +35,12 @@ #include <coreplugin/icore.h> -#include <QtGui/QFontMetrics> -#include <QtGui/QPainter> -#include <QtGui/QScrollBar> -#include <QtGui/QPushButton> -#include <QtCore/QSettings> -#include <QtCore/QByteArray> +#include <QFontMetrics> +#include <QPainter> +#include <QScrollBar> +#include <QPushButton> +#include <QSettings> +#include <QByteArray> static const char groupC[] = "CPaster"; static const char heightKeyC[] = "PasteViewHeight"; diff --git a/src/plugins/cpaster/pasteview.h b/src/plugins/cpaster/pasteview.h index 1f4b971496..d2ced6e1ad 100644 --- a/src/plugins/cpaster/pasteview.h +++ b/src/plugins/cpaster/pasteview.h @@ -36,7 +36,7 @@ #include "ui_pasteview.h" #include "splitter.h" -#include <QtGui/QDialog> +#include <QDialog> namespace CodePaster { class Protocol; diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp index eabe6c5354..462cf4c8ce 100644 --- a/src/plugins/cpaster/protocol.cpp +++ b/src/plugins/cpaster/protocol.cpp @@ -38,17 +38,17 @@ #include <coreplugin/icore.h> #include <coreplugin/dialogs/ioptionspage.h> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QNetworkReply> +#include <QNetworkRequest> +#include <QNetworkReply> -#include <QtCore/QUrl> -#include <QtCore/QDebug> -#include <QtCore/QVariant> +#include <QUrl> +#include <QDebug> +#include <QVariant> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QPushButton> +#include <QMessageBox> +#include <QApplication> +#include <QMainWindow> +#include <QPushButton> namespace CodePaster { diff --git a/src/plugins/cpaster/protocol.h b/src/plugins/cpaster/protocol.h index c0a491224f..b01776fbe6 100644 --- a/src/plugins/cpaster/protocol.h +++ b/src/plugins/cpaster/protocol.h @@ -33,9 +33,9 @@ #ifndef PROTOCOL_H #define PROTOCOL_H -#include <QtCore/QObject> -#include <QtCore/QScopedPointer> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QScopedPointer> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QNetworkAccessManager; diff --git a/src/plugins/cpaster/settings.cpp b/src/plugins/cpaster/settings.cpp index 9573279022..3830ccf38a 100644 --- a/src/plugins/cpaster/settings.cpp +++ b/src/plugins/cpaster/settings.cpp @@ -33,8 +33,8 @@ #include "settings.h" #include "pastebindotcomprotocol.h" -#include <QtCore/QVariant> -#include <QtCore/QSettings> +#include <QVariant> +#include <QSettings> static const char groupC[] = "CodePaster"; static const char userNameKeyC[] = "UserName"; diff --git a/src/plugins/cpaster/settings.h b/src/plugins/cpaster/settings.h index 0e9de809cb..151d89e0bd 100644 --- a/src/plugins/cpaster/settings.h +++ b/src/plugins/cpaster/settings.h @@ -33,7 +33,7 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index 9409e3bcf1..d20ad35a79 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -37,9 +37,9 @@ #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QSettings> +#include <QTextStream> +#include <QCoreApplication> namespace CodePaster { diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h index a42bd3703a..7746056f7b 100644 --- a/src/plugins/cpaster/settingspage.h +++ b/src/plugins/cpaster/settingspage.h @@ -37,9 +37,9 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtCore/QPointer> +#include <QStringList> +#include <QSharedPointer> +#include <QPointer> namespace CodePaster { diff --git a/src/plugins/cppeditor/cppautocompleter.cpp b/src/plugins/cppeditor/cppautocompleter.cpp index 6df2dbef60..442108a67a 100644 --- a/src/plugins/cppeditor/cppautocompleter.cpp +++ b/src/plugins/cppeditor/cppautocompleter.cpp @@ -38,8 +38,8 @@ #include <cplusplus/MatchingText.h> #include <cplusplus/BackwardsScanner.h> -#include <QtCore/QLatin1Char> -#include <QtGui/QTextCursor> +#include <QLatin1Char> +#include <QTextCursor> using namespace CppEditor; using namespace Internal; diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp index 3388af7aac..d41a7c204b 100644 --- a/src/plugins/cppeditor/cppclasswizard.cpp +++ b/src/plugins/cppeditor/cppclasswizard.cpp @@ -42,17 +42,17 @@ #include <utils/newclasswidget.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtCore/QSettings> - -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> -#include <QtGui/QSpacerItem> -#include <QtGui/QWizard> +#include <QDebug> +#include <QDir> +#include <QTextStream> +#include <QSettings> + +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QPushButton> +#include <QToolButton> +#include <QSpacerItem> +#include <QWizard> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h index 4608520acb..118dd589a3 100644 --- a/src/plugins/cppeditor/cppclasswizard.h +++ b/src/plugins/cppeditor/cppclasswizard.h @@ -36,8 +36,8 @@ #include <coreplugin/basefilewizard.h> #include <utils/wizard.h> -#include <QtCore/QStringList> -#include <QtGui/QWizardPage> +#include <QStringList> +#include <QWizardPage> namespace Utils { diff --git a/src/plugins/cppeditor/cppcompleteswitch.cpp b/src/plugins/cppeditor/cppcompleteswitch.cpp index 836201a277..c0deb7a5e2 100644 --- a/src/plugins/cppeditor/cppcompleteswitch.cpp +++ b/src/plugins/cppeditor/cppcompleteswitch.cpp @@ -43,7 +43,7 @@ #include <CoreTypes.h> #include <Symbols.h> -#include <QtGui/QApplication> +#include <QApplication> using namespace CPlusPlus; using namespace CppEditor; diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 48b2ec3832..e4e0b712d5 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -97,24 +97,24 @@ #include <texteditor/codeassist/basicproposalitem.h> #include <texteditor/codeassist/genericproposal.h> -#include <QtCore/QDebug> -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QStack> -#include <QtCore/QSettings> -#include <QtCore/QSignalMapper> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QHeaderView> -#include <QtGui/QLayout> -#include <QtGui/QMenu> -#include <QtGui/QShortcut> -#include <QtGui/QTextEdit> -#include <QtGui/QComboBox> -#include <QtGui/QToolBar> -#include <QtGui/QTreeView> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QMainWindow> +#include <QDebug> +#include <QTime> +#include <QTimer> +#include <QStack> +#include <QSettings> +#include <QSignalMapper> +#include <QAction> +#include <QApplication> +#include <QHeaderView> +#include <QLayout> +#include <QMenu> +#include <QShortcut> +#include <QTextEdit> +#include <QComboBox> +#include <QToolBar> +#include <QTreeView> +#include <QSortFilterProxyModel> +#include <QMainWindow> #include <sstream> diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 2f9b235e92..82cba02a94 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -44,12 +44,12 @@ #include <cpptools/commentssettings.h> #include <cpptools/cppsemanticinfo.h> -#include <QtCore/QThread> -#include <QtCore/QMutex> -#include <QtCore/QWaitCondition> -#include <QtCore/QFutureWatcher> -#include <QtCore/QModelIndex> -#include <QtCore/QVector> +#include <QThread> +#include <QMutex> +#include <QWaitCondition> +#include <QFutureWatcher> +#include <QModelIndex> +#include <QVector> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/cppeditor/cppeditor_global.h b/src/plugins/cppeditor/cppeditor_global.h index 78b49dfd92..ee856d081d 100644 --- a/src/plugins/cppeditor/cppeditor_global.h +++ b/src/plugins/cppeditor/cppeditor_global.h @@ -33,7 +33,7 @@ #ifndef CPPEDITOR_GLOBAL_H #define CPPEDITOR_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(CPPEDITOR_LIBRARY) # define CPPEDITOR_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp index fa063aea6e..980768e593 100644 --- a/src/plugins/cppeditor/cppelementevaluator.cpp +++ b/src/plugins/cppeditor/cppelementevaluator.cpp @@ -51,10 +51,10 @@ #include <cplusplus/LookupItem.h> #include <cplusplus/Icons.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QSet> -#include <QtCore/QQueue> +#include <QDir> +#include <QFileInfo> +#include <QSet> +#include <QQueue> using namespace CppEditor; using namespace Internal; diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h index fce6551537..bb8ba134da 100644 --- a/src/plugins/cppeditor/cppelementevaluator.h +++ b/src/plugins/cppeditor/cppelementevaluator.h @@ -40,11 +40,11 @@ #include <cplusplus/CppDocument.h> #include <cplusplus/Overview.h> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtGui/QTextCursor> -#include <QtGui/QIcon> +#include <QString> +#include <QStringList> +#include <QSharedPointer> +#include <QTextCursor> +#include <QIcon> namespace CPlusPlus { class LookupItem; diff --git a/src/plugins/cppeditor/cppfilewizard.cpp b/src/plugins/cppeditor/cppfilewizard.cpp index 9c04ca762f..54790a5714 100644 --- a/src/plugins/cppeditor/cppfilewizard.cpp +++ b/src/plugins/cppeditor/cppfilewizard.cpp @@ -37,9 +37,9 @@ #include <cpptools/abstracteditorsupport.h> #include <utils/codegeneration.h> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QTextStream> +#include <QFileInfo> +#include <QDebug> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 3c79791d36..b7af611ae2 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -55,8 +55,8 @@ #include <coreplugin/icore.h> #include <texteditor/texteditorconstants.h> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QVarLengthArray> +#include <QtConcurrentRun> +#include <QVarLengthArray> using namespace CPlusPlus; using namespace CppEditor; diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.h b/src/plugins/cppeditor/cppfunctiondecldeflink.h index 2b2b4ae897..b7090de6e9 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.h +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.h @@ -41,11 +41,11 @@ #include <cpptools/cpprefactoringchanges.h> #include <utils/changeset.h> -#include <QtCore/QString> -#include <QtCore/QCoreApplication> -#include <QtCore/QSharedPointer> -#include <QtCore/QFutureWatcher> -#include <QtGui/QTextCursor> +#include <QString> +#include <QCoreApplication> +#include <QSharedPointer> +#include <QFutureWatcher> +#include <QTextCursor> namespace CppEditor { namespace Internal { diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index 347d8546de..406d9b9467 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -37,8 +37,8 @@ #include <cplusplus/SimpleLexer.h> #include <texteditor/basetextdocumentlayout.h> -#include <QtGui/QTextDocument> -#include <QtCore/QDebug> +#include <QTextDocument> +#include <QDebug> using namespace CppEditor::Internal; using namespace TextEditor; diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h index 9019153948..ac79df8114 100644 --- a/src/plugins/cppeditor/cpphighlighter.h +++ b/src/plugins/cppeditor/cpphighlighter.h @@ -35,8 +35,8 @@ #include "cppeditorenums.h" #include <texteditor/syntaxhighlighter.h> -#include <QtGui/QTextCharFormat> -#include <QtCore/QtAlgorithms> +#include <QTextCharFormat> +#include <QtAlgorithms> namespace CppEditor { diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index a8aab85d83..6e6d3e30ee 100644 --- a/src/plugins/cppeditor/cpphoverhandler.cpp +++ b/src/plugins/cppeditor/cpphoverhandler.cpp @@ -43,8 +43,8 @@ #include <texteditor/basetexteditor.h> #include <texteditor/helpitem.h> -#include <QtGui/QTextCursor> -#include <QtCore/QUrl> +#include <QTextCursor> +#include <QUrl> using namespace CppEditor::Internal; using namespace Core; diff --git a/src/plugins/cppeditor/cpphoverhandler.h b/src/plugins/cppeditor/cpphoverhandler.h index 9a6480f23c..ee7411ae9a 100644 --- a/src/plugins/cppeditor/cpphoverhandler.h +++ b/src/plugins/cppeditor/cpphoverhandler.h @@ -35,7 +35,7 @@ #include <texteditor/basehoverhandler.h> -#include <QtCore/QObject> +#include <QObject> namespace Core { class IEditor; diff --git a/src/plugins/cppeditor/cppinsertdecldef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp index 2da7055c1e..827e8ad5ee 100644 --- a/src/plugins/cppeditor/cppinsertdecldef.cpp +++ b/src/plugins/cppeditor/cppinsertdecldef.cpp @@ -45,14 +45,14 @@ #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QHash> -#include <QtCore/QStringBuilder> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> -#include <QtGui/QInputDialog> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QDir> +#include <QHash> +#include <QStringBuilder> +#include <QTextDocument> +#include <QTextBlock> +#include <QInputDialog> +#include <QMessageBox> using namespace CPlusPlus; using namespace CppEditor; diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp index e34e516ce7..7a5e34ec54 100644 --- a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp +++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp @@ -44,7 +44,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QTextStream> +#include <QTextStream> using namespace CPlusPlus; using namespace CppTools; diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.h b/src/plugins/cppeditor/cppinsertqtpropertymembers.h index 78479f06c2..a87f6f3565 100644 --- a/src/plugins/cppeditor/cppinsertqtpropertymembers.h +++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.h @@ -35,7 +35,7 @@ #include <cppeditor/cppquickfix.h> -#include <QtCore/QString> +#include <QString> namespace CPlusPlus { class QtPropertyDeclarationAST; diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp index 7553d092d5..727f0c5fa5 100644 --- a/src/plugins/cppeditor/cppoutline.cpp +++ b/src/plugins/cppeditor/cppoutline.cpp @@ -40,10 +40,10 @@ #include <cplusplus/OverviewModel.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtGui/QVBoxLayout> -#include <QtGui/QMenu> +#include <QDebug> +#include <QTimer> +#include <QVBoxLayout> +#include <QMenu> using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppoutline.h b/src/plugins/cppeditor/cppoutline.h index 2ada826692..923fcf6819 100644 --- a/src/plugins/cppeditor/cppoutline.h +++ b/src/plugins/cppeditor/cppoutline.h @@ -38,8 +38,8 @@ #include <utils/navigationtreeview.h> #include <texteditor/ioutlinewidget.h> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QTreeView> +#include <QSortFilterProxyModel> +#include <QTreeView> namespace CppEditor { namespace Internal { diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index 69bee4b568..072cce9806 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -61,13 +61,13 @@ #include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolssettings.h> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QTimer> -#include <QtCore/QCoreApplication> -#include <QtCore/QStringList> +#include <QFileInfo> +#include <QSettings> +#include <QTimer> +#include <QCoreApplication> +#include <QStringList> -#include <QtGui/QMenu> +#include <QMenu> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h index 386a18f6bf..f082fdcdc2 100644 --- a/src/plugins/cppeditor/cppplugin.h +++ b/src/plugins/cppeditor/cppplugin.h @@ -36,9 +36,9 @@ #include <extensionsystem/iplugin.h> #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QtPlugin> -#include <QtCore/QStringList> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QStringList> +#include <QAction> namespace TextEditor { class TextEditorActionHandler; diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp index 500d757ab2..247d4ab3c9 100644 --- a/src/plugins/cppeditor/cppquickfix.cpp +++ b/src/plugins/cppeditor/cppquickfix.cpp @@ -48,8 +48,8 @@ #include <cpptools/cpprefactoringchanges.h> -#include <QtGui/QTextBlock> -#include <QtCore/QFileInfo> +#include <QTextBlock> +#include <QFileInfo> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp index 78ed85367c..23ed9bfa0c 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.cpp +++ b/src/plugins/cppeditor/cppquickfixassistant.cpp @@ -53,8 +53,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QFileInfo> -#include <QtGui/QTextBlock> +#include <QFileInfo> +#include <QTextBlock> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 7bfd97b7e3..6505989da9 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -70,10 +70,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtGui/QApplication> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> +#include <QFileInfo> +#include <QApplication> +#include <QTextBlock> +#include <QTextCursor> #include <cctype> using namespace CppEditor; diff --git a/src/plugins/cppeditor/cppsnippetprovider.cpp b/src/plugins/cppeditor/cppsnippetprovider.cpp index ec12ac0036..93f085804d 100644 --- a/src/plugins/cppeditor/cppsnippetprovider.cpp +++ b/src/plugins/cppeditor/cppsnippetprovider.cpp @@ -43,8 +43,8 @@ #include <texteditor/texteditorconstants.h> #include <texteditor/snippets/snippeteditor.h> -#include <QtCore/QLatin1String> -#include <QtCore/QCoreApplication> +#include <QLatin1String> +#include <QCoreApplication> using namespace CppEditor; using namespace Internal; diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp index 738e21c86f..886c369856 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.cpp +++ b/src/plugins/cppeditor/cpptypehierarchy.cpp @@ -41,13 +41,13 @@ #include <utils/navigationtreeview.h> #include <utils/annotateditemdelegate.h> -#include <QtCore/QLatin1Char> -#include <QtCore/QLatin1String> -#include <QtCore/QModelIndex> -#include <QtCore/QVector> -#include <QtGui/QVBoxLayout> -#include <QtGui/QStandardItemModel> -#include <QtGui/QLabel> +#include <QLatin1Char> +#include <QLatin1String> +#include <QModelIndex> +#include <QVector> +#include <QVBoxLayout> +#include <QStandardItemModel> +#include <QLabel> using namespace CppEditor; using namespace Internal; diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h index 4e172ede85..ed8510f936 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.h +++ b/src/plugins/cppeditor/cpptypehierarchy.h @@ -35,9 +35,9 @@ #include <coreplugin/inavigationwidgetfactory.h> -#include <QtCore/QString> -#include <QtGui/QWidget> -#include <QtGui/QStackedWidget> +#include <QString> +#include <QWidget> +#include <QStackedWidget> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp index 13704c55ab..e6e3e20651 100644 --- a/src/plugins/cpptools/abstracteditorsupport.cpp +++ b/src/plugins/cpptools/abstracteditorsupport.cpp @@ -44,7 +44,7 @@ #include <Scope.h> #include <coreplugin/icore.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace CPlusPlus; diff --git a/src/plugins/cpptools/abstracteditorsupport.h b/src/plugins/cpptools/abstracteditorsupport.h index fafc1a6f14..192a84b44c 100644 --- a/src/plugins/cpptools/abstracteditorsupport.h +++ b/src/plugins/cpptools/abstracteditorsupport.h @@ -35,7 +35,7 @@ #include "cpptools_global.h" -#include <QtCore/QString> +#include <QString> namespace CPlusPlus { class CppModelManagerInterface; diff --git a/src/plugins/cpptools/commentssettings.cpp b/src/plugins/cpptools/commentssettings.cpp index 0cf2edfc96..6a08b4e1cc 100644 --- a/src/plugins/cpptools/commentssettings.cpp +++ b/src/plugins/cpptools/commentssettings.cpp @@ -1,6 +1,6 @@ #include "commentssettings.h" -#include <QtCore/QSettings> +#include <QSettings> using namespace CppTools; diff --git a/src/plugins/cpptools/completionsettingspage.cpp b/src/plugins/cpptools/completionsettingspage.cpp index 1af24daff9..ca029a0448 100644 --- a/src/plugins/cpptools/completionsettingspage.cpp +++ b/src/plugins/cpptools/completionsettingspage.cpp @@ -38,8 +38,8 @@ #include <extensionsystem/pluginmanager.h> #include <texteditor/texteditorsettings.h> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QTextStream> +#include <QCoreApplication> using namespace CppTools; using namespace CppTools::Internal; diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp index 82e72452c8..2a3c9d2289 100644 --- a/src/plugins/cpptools/cppchecksymbols.cpp +++ b/src/plugins/cpptools/cppchecksymbols.cpp @@ -45,9 +45,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QThreadPool> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QThreadPool> +#include <QDebug> #include <utils/runextensions.h> diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h index d3b638ec70..56dfc541f5 100644 --- a/src/plugins/cpptools/cppchecksymbols.h +++ b/src/plugins/cpptools/cppchecksymbols.h @@ -42,9 +42,9 @@ #include <texteditor/semantichighlighter.h> #include <ASTVisitor.h> -#include <QtCore/QSet> -#include <QtCore/QFuture> -#include <QtCore/QtConcurrentRun> +#include <QSet> +#include <QFuture> +#include <QtConcurrentRun> namespace CPlusPlus { diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index c10d928dbb..50f2165659 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -39,11 +39,11 @@ #include <texteditor/tabsettings.h> #include <utils/qtcassert.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> #include "cppcodestylesettingspage.h" diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h index 2b93b782f7..8dab0dbc81 100644 --- a/src/plugins/cpptools/cppcodeformatter.h +++ b/src/plugins/cpptools/cppcodeformatter.h @@ -40,11 +40,11 @@ #include <texteditor/tabsettings.h> #include <cpptools/cppcodestylesettings.h> -#include <QtCore/QChar> -#include <QtCore/QStack> -#include <QtCore/QList> -#include <QtCore/QVector> -#include <QtCore/QPointer> +#include <QChar> +#include <QStack> +#include <QList> +#include <QVector> +#include <QPointer> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp index 7eaf74601e..de1d65cf69 100644 --- a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp +++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp @@ -40,7 +40,7 @@ #include <texteditor/tabsettings.h> #include <texteditor/snippets/isnippetprovider.h> #include <cppeditor/cppeditorconstants.h> -#include <QtGui/QLayout> +#include <QLayout> using namespace CppTools; diff --git a/src/plugins/cpptools/cppcodestylesettings.h b/src/plugins/cpptools/cppcodestylesettings.h index 3dd59118ad..b1239b5b49 100644 --- a/src/plugins/cpptools/cppcodestylesettings.h +++ b/src/plugins/cpptools/cppcodestylesettings.h @@ -35,8 +35,8 @@ #include "cpptools_global.h" -#include <QtCore/QMetaType> -#include <QtCore/QVariant> +#include <QMetaType> +#include <QVariant> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 070d711b8c..10b6297b8b 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -45,8 +45,8 @@ #include <extensionsystem/pluginmanager.h> #include <cppeditor/cppeditorconstants.h> #include <coreplugin/icore.h> -#include <QtGui/QTextBlock> -#include <QtCore/QTextStream> +#include <QTextBlock> +#include <QTextStream> static const char *defaultCodeStyleSnippets[] = { "#include <math.h>\n" diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h index 197c19baa2..c40fbe9ed6 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.h +++ b/src/plugins/cpptools/cppcodestylesettingspage.h @@ -36,11 +36,11 @@ #include "cpptools_global.h" #include <coreplugin/dialogs/ioptionspage.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QVariant> -#include <QtCore/QStringList> +#include <QWidget> +#include <QPointer> +#include <QSharedPointer> +#include <QVariant> +#include <QStringList> #include "cppcodestylesettings.h" #include "cppcodeformatter.h" diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index fa4d7fd164..868d454084 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -71,10 +71,10 @@ #include <texteditor/completionsettings.h> #include <utils/qtcassert.h> -#include <QtCore/QLatin1String> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> -#include <QtGui/QIcon> +#include <QLatin1String> +#include <QTextCursor> +#include <QTextDocument> +#include <QIcon> using namespace CPlusPlus; using namespace CppEditor; diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index 527deb3386..7991acfc62 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -47,8 +47,8 @@ #include <texteditor/snippets/snippetassistcollector.h> #include <texteditor/codeassist/defaultassistinterface.h> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QStringList> +#include <QVariant> QT_BEGIN_NAMESPACE class QTextCursor; diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp index eaecfff940..bad78b3211 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <cplusplus/CppDocument.h> -#include <QtCore/QStringMatcher> +#include <QStringMatcher> using namespace CppTools::Internal; using namespace CPlusPlus; diff --git a/src/plugins/cpptools/cppdoxygen.cpp b/src/plugins/cpptools/cppdoxygen.cpp index 2c76ed3edf..781786f425 100644 --- a/src/plugins/cpptools/cppdoxygen.cpp +++ b/src/plugins/cpptools/cppdoxygen.cpp @@ -32,7 +32,7 @@ #include "cppdoxygen.h" -#include <QtCore/QString> +#include <QString> using namespace CppTools; diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 5fe943a806..c279f8cd0f 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -43,18 +43,18 @@ #include <utils/fileutils.h> -#include <QtCore/QSettings> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QDate> -#include <QtCore/QLocale> -#include <QtCore/QTextCodec> -#include <QtCore/QTextStream> - -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QSettings> +#include <QDebug> +#include <QFile> +#include <QFileInfo> +#include <QCoreApplication> +#include <QDate> +#include <QLocale> +#include <QTextCodec> +#include <QTextStream> + +#include <QFileDialog> +#include <QMessageBox> static const char headerSuffixKeyC[] = "HeaderSuffix"; static const char sourceSuffixKeyC[] = "SourceSuffix"; diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h index 876a356c1e..6fc9a4019b 100644 --- a/src/plugins/cpptools/cppfilesettingspage.h +++ b/src/plugins/cpptools/cppfilesettingspage.h @@ -35,9 +35,9 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> -#include <QtGui/QWidget> +#include <QPointer> +#include <QSharedPointer> +#include <QWidget> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 9071239626..99361c5f38 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -60,12 +60,12 @@ #include <cplusplus/Overview.h> #include <cplusplus/FindUsages.h> -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QtConcurrentMap> -#include <QtCore/QDir> -#include <QtGui/QApplication> +#include <QTime> +#include <QTimer> +#include <QtConcurrentRun> +#include <QtConcurrentMap> +#include <QDir> +#include <QApplication> #include <utils/runextensions.h> #include <functional> diff --git a/src/plugins/cpptools/cppfindreferences.h b/src/plugins/cpptools/cppfindreferences.h index e86563d507..5d13f12cf0 100644 --- a/src/plugins/cpptools/cppfindreferences.h +++ b/src/plugins/cpptools/cppfindreferences.h @@ -38,12 +38,12 @@ #include <cplusplus/DependencyTable.h> #include <cplusplus/FindUsages.h> -#include <QtCore/QMutex> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QFuture> -#include <QtCore/QFutureWatcher> -#include <QtCore/QMetaType> +#include <QMutex> +#include <QObject> +#include <QPointer> +#include <QFuture> +#include <QFutureWatcher> +#include <QMetaType> QT_FORWARD_DECLARE_CLASS(QTimer) diff --git a/src/plugins/cpptools/cpphighlightingsupport.h b/src/plugins/cpptools/cpphighlightingsupport.h index e5ef29d3a2..9776802c11 100644 --- a/src/plugins/cpptools/cpphighlightingsupport.h +++ b/src/plugins/cpptools/cpphighlightingsupport.h @@ -38,7 +38,7 @@ #include <cplusplus/CppDocument.h> #include <texteditor/semantichighlighter.h> -#include <QtCore/QFuture> +#include <QFuture> namespace CppTools { namespace Internal { diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index 0db47372a1..bb5867b403 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/src/plugins/cpptools/cpplocatorfilter.cpp @@ -36,7 +36,7 @@ #include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h> -#include <QtCore/QStringMatcher> +#include <QStringMatcher> using namespace CppTools::Internal; diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 15109e0f00..b3df985303 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -42,9 +42,9 @@ #endif #include <functional> -#include <QtCore/QtConcurrentRun> +#include <QtConcurrentRun> #ifndef ICHECK_BUILD -# include <QtCore/QFutureSynchronizer> +# include <QFutureSynchronizer> # include <utils/runextensions.h> # include <texteditor/itexteditor.h> # include <texteditor/basetexteditor.h> @@ -58,7 +58,7 @@ # include <coreplugin/progressmanager/progressmanager.h> # include <extensionsystem/pluginmanager.h> #else -# include <QtCore/QDir> +# include <QDir> #endif #include <utils/qtcassert.h> @@ -78,14 +78,14 @@ #include <Control.h> #include <CoreTypes.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QMutexLocker> -#include <QtCore/QTime> -#include <QtCore/QTimer> +#include <QCoreApplication> +#include <QDebug> +#include <QMutexLocker> +#include <QTime> +#include <QTimer> #include <QtConcurrentMap> -#include <QtGui/QTextBlock> +#include <QTextBlock> #include <iostream> #include <sstream> diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index e7d0675de1..025e066231 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -49,12 +49,12 @@ #ifdef ICHECK_BUILD # include "parsemanager.h" #else -# include <QtCore/QHash> -# include <QtCore/QFutureInterface> -# include <QtCore/QFutureSynchronizer> -# include <QtCore/QMutex> -# include <QtCore/QTimer> -# include <QtGui/QTextEdit> // for QTextEdit::ExtraSelection +# include <QHash> +# include <QFutureInterface> +# include <QFutureSynchronizer> +# include <QMutex> +# include <QTimer> +# include <QTextEdit> // for QTextEdit::ExtraSelection #endif namespace Core { diff --git a/src/plugins/cpptools/cppqtstyleindenter.cpp b/src/plugins/cpptools/cppqtstyleindenter.cpp index 4373449544..fbcf00dd99 100644 --- a/src/plugins/cpptools/cppqtstyleindenter.cpp +++ b/src/plugins/cpptools/cppqtstyleindenter.cpp @@ -39,10 +39,10 @@ #include <texteditor/tabsettings.h> #include <texteditor/texteditorsettings.h> -#include <QtCore/QChar> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> +#include <QChar> +#include <QTextDocument> +#include <QTextBlock> +#include <QTextCursor> using namespace CppTools; diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp index 030a9c018d..1e71c236b1 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.cpp +++ b/src/plugins/cpptools/cpprefactoringchanges.cpp @@ -45,7 +45,7 @@ #include <projectexplorer/editorconfiguration.h> #include <utils/qtcassert.h> -#include <QtGui/QTextBlock> +#include <QTextBlock> using namespace CPlusPlus; using namespace CppTools; diff --git a/src/plugins/cpptools/cppsemanticinfo.h b/src/plugins/cpptools/cppsemanticinfo.h index af57130071..cf61b74559 100644 --- a/src/plugins/cpptools/cppsemanticinfo.h +++ b/src/plugins/cpptools/cppsemanticinfo.h @@ -38,7 +38,7 @@ #include <cplusplus/CppDocument.h> #include <cplusplus/LookupContext.h> #include <texteditor/semantichighlighter.h> -#include <QtCore/QHash> +#include <QHash> namespace CppTools { diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h index ec27076d44..038ce59b75 100644 --- a/src/plugins/cpptools/cpptoolsconstants.h +++ b/src/plugins/cpptools/cpptoolsconstants.h @@ -33,7 +33,7 @@ #ifndef CPPTOOLSCONSTANTS_H #define CPPTOOLSCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace CppTools { namespace Constants { diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 3f3c3c8a50..92a448d55c 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -44,7 +44,7 @@ #include <ASTVisitor.h> #include <TranslationUnit.h> -#include <QtCore/QTimer> +#include <QTimer> using namespace CppTools; using namespace CppTools::Internal; diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h index 353dd7bdcd..065d3c5e1b 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.h +++ b/src/plugins/cpptools/cpptoolseditorsupport.h @@ -33,13 +33,13 @@ #ifndef CPPTOOLSEDITORSUPPORT_H #define CPPTOOLSEDITORSUPPORT_H -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QFuture> -#include <QtCore/QScopedPointer> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QPointer> +#include <QFuture> +#include <QScopedPointer> +#include <QSharedPointer> -#include <QtGui/QTextCursor> +#include <QTextCursor> #include <cplusplus/CppDocument.h> diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index ca441f5026..c72e65e46c 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -59,8 +59,8 @@ #include <coreplugin/filemanager.h> #include <cppeditor/cppeditorconstants.h> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QFutureSynchronizer> +#include <QtConcurrentRun> +#include <QFutureSynchronizer> #include <utils/runextensions.h> #include <find/ifindfilter.h> @@ -68,13 +68,13 @@ #include <utils/filesearch.h> #include <utils/qtcassert.h> -#include <QtCore/QtPlugin> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QSettings> +#include <QMenu> +#include <QAction> #include <sstream> diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 48025b6ffb..51319ffc96 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -38,13 +38,13 @@ #include <find/ifindfilter.h> #include <utils/filesearch.h> -#include <QtGui/QTextDocument> -#include <QtGui/QKeySequence> -#include <QtCore/QSharedPointer> -#include <QtCore/QFutureInterface> -#include <QtCore/QPointer> -#include <QtCore/QFutureWatcher> -#include <QtCore/QHash> +#include <QTextDocument> +#include <QKeySequence> +#include <QSharedPointer> +#include <QFutureInterface> +#include <QPointer> +#include <QFutureWatcher> +#include <QHash> QT_BEGIN_NAMESPACE class QFileInfo; diff --git a/src/plugins/cpptools/cpptoolsreuse.cpp b/src/plugins/cpptools/cpptoolsreuse.cpp index ed663f0482..4b7713cf7e 100644 --- a/src/plugins/cpptools/cpptoolsreuse.cpp +++ b/src/plugins/cpptools/cpptoolsreuse.cpp @@ -37,9 +37,9 @@ #include <cplusplus/Overview.h> #include <cplusplus/LookupContext.h> -#include <QtCore/QSet> -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> +#include <QSet> +#include <QTextDocument> +#include <QTextCursor> using namespace CPlusPlus; diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp index e3c1942bac..2d1b333c19 100644 --- a/src/plugins/cpptools/cpptoolssettings.cpp +++ b/src/plugins/cpptools/cpptoolssettings.cpp @@ -46,7 +46,7 @@ #include <utils/settingsutils.h> #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtCore/QSettings> +#include <QSettings> static const char *idKey = "CppGlobal"; diff --git a/src/plugins/cpptools/cpptoolssettings.h b/src/plugins/cpptools/cpptoolssettings.h index 98a8e1741a..282f46e6c5 100644 --- a/src/plugins/cpptools/cpptoolssettings.h +++ b/src/plugins/cpptools/cpptoolssettings.h @@ -35,7 +35,7 @@ #include "cpptools_global.h" -#include <QtCore/QObject> +#include <QObject> namespace CppTools { diff --git a/src/plugins/cpptools/doxygengenerator.cpp b/src/plugins/cpptools/doxygengenerator.cpp index 9b2e5aaee3..330ff17494 100644 --- a/src/plugins/cpptools/doxygengenerator.cpp +++ b/src/plugins/cpptools/doxygengenerator.cpp @@ -12,8 +12,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QStringBuilder> -#include <QtGui/QTextDocument> +#include <QStringBuilder> +#include <QTextDocument> #include <QDebug> using namespace CppTools; diff --git a/src/plugins/cpptools/doxygengenerator.h b/src/plugins/cpptools/doxygengenerator.h index 78b6b6b914..a6e48f1ea2 100644 --- a/src/plugins/cpptools/doxygengenerator.h +++ b/src/plugins/cpptools/doxygengenerator.h @@ -5,8 +5,8 @@ #include <cplusplus/Overview.h> -#include <QtCore/QLatin1String> -#include <QtGui/QTextCursor> +#include <QLatin1String> +#include <QTextCursor> namespace CPlusPlus { class DeclarationAST; diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h index d6ba8d9dbd..6f9066f767 100644 --- a/src/plugins/cpptools/searchsymbols.h +++ b/src/plugins/cpptools/searchsymbols.h @@ -41,11 +41,11 @@ #include <Symbols.h> #include <SymbolVisitor.h> -#include <QtGui/QIcon> -#include <QtCore/QMetaType> -#include <QtCore/QString> -#include <QtCore/QSet> -#include <QtCore/QHash> +#include <QIcon> +#include <QMetaType> +#include <QString> +#include <QSet> +#include <QHash> #include <functional> diff --git a/src/plugins/cpptools/symbolfinder.cpp b/src/plugins/cpptools/symbolfinder.cpp index 883f18d4fe..33329d1046 100644 --- a/src/plugins/cpptools/symbolfinder.cpp +++ b/src/plugins/cpptools/symbolfinder.cpp @@ -11,7 +11,7 @@ #include <Control.h> #include <LookupContext.h> -#include <QtCore/QDebug> +#include <QDebug> #include <utils/qtcassert.h> diff --git a/src/plugins/cpptools/symbolfinder.h b/src/plugins/cpptools/symbolfinder.h index 23310c399b..1ad4e203a9 100644 --- a/src/plugins/cpptools/symbolfinder.h +++ b/src/plugins/cpptools/symbolfinder.h @@ -6,10 +6,10 @@ #include <CppDocument.h> #include <CPlusPlusForwardDeclarations.h> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtCore/QMultiMap> -#include <QtCore/QSet> +#include <QHash> +#include <QStringList> +#include <QMultiMap> +#include <QSet> namespace CppTools { diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index b1fc1a5567..944d471392 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/src/plugins/cpptools/symbolsfindfilter.cpp @@ -44,11 +44,11 @@ #include <projectexplorer/project.h> #include <utils/qtcassert.h> -#include <QtCore/QSet> -#include <QtCore/QRegExp> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QButtonGroup> +#include <QSet> +#include <QRegExp> +#include <QGridLayout> +#include <QLabel> +#include <QButtonGroup> using namespace CppTools; using namespace CppTools::Internal; diff --git a/src/plugins/cpptools/symbolsfindfilter.h b/src/plugins/cpptools/symbolsfindfilter.h index 4779590caa..478cf55685 100644 --- a/src/plugins/cpptools/symbolsfindfilter.h +++ b/src/plugins/cpptools/symbolsfindfilter.h @@ -38,12 +38,12 @@ #include <find/ifindfilter.h> #include <find/searchresultwindow.h> -#include <QtCore/QFutureInterface> -#include <QtCore/QFutureWatcher> -#include <QtCore/QPointer> -#include <QtGui/QWidget> -#include <QtGui/QCheckBox> -#include <QtGui/QRadioButton> +#include <QFutureInterface> +#include <QFutureWatcher> +#include <QPointer> +#include <QWidget> +#include <QCheckBox> +#include <QRadioButton> namespace CppTools { namespace Internal { diff --git a/src/plugins/cpptools/uicodecompletionsupport.cpp b/src/plugins/cpptools/uicodecompletionsupport.cpp index 89d812bdb1..87051bd8ad 100644 --- a/src/plugins/cpptools/uicodecompletionsupport.cpp +++ b/src/plugins/cpptools/uicodecompletionsupport.cpp @@ -32,9 +32,9 @@ #include "uicodecompletionsupport.h" -#include <QtCore/QProcess> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <QProcess> +#include <QFile> +#include <QFileInfo> enum { debug = 0 }; diff --git a/src/plugins/cpptools/uicodecompletionsupport.h b/src/plugins/cpptools/uicodecompletionsupport.h index 2fa0c8cc8f..ad0495942c 100644 --- a/src/plugins/cpptools/uicodecompletionsupport.h +++ b/src/plugins/cpptools/uicodecompletionsupport.h @@ -39,7 +39,7 @@ #include <cplusplus/ModelManagerInterface.h> -#include <QtCore/QDateTime> +#include <QDateTime> namespace CppTools { diff --git a/src/plugins/cvs/checkoutwizard.cpp b/src/plugins/cvs/checkoutwizard.cpp index 92210ea3d0..d004d7cbdf 100644 --- a/src/plugins/cvs/checkoutwizard.cpp +++ b/src/plugins/cvs/checkoutwizard.cpp @@ -40,7 +40,7 @@ #include <vcsbase/vcsconfigurationpage.h> #include <utils/qtcassert.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Cvs { namespace Internal { diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp index 0cf050f2ea..4127eac99e 100644 --- a/src/plugins/cvs/cvscontrol.cpp +++ b/src/plugins/cvs/cvscontrol.cpp @@ -36,7 +36,7 @@ #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Cvs; using namespace Cvs::Internal; diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp index 45b3fc364d..b88f40e78d 100644 --- a/src/plugins/cvs/cvseditor.cpp +++ b/src/plugins/cvs/cvseditor.cpp @@ -39,9 +39,9 @@ #include <utils/qtcassert.h> #include <vcsbase/diffhighlighter.h> -#include <QtCore/QDebug> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QTextCursor> +#include <QTextBlock> namespace Cvs { namespace Internal { diff --git a/src/plugins/cvs/cvseditor.h b/src/plugins/cvs/cvseditor.h index 693f07cb3e..7c376d66ec 100644 --- a/src/plugins/cvs/cvseditor.h +++ b/src/plugins/cvs/cvseditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Cvs { namespace Internal { diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 6cf7a36971..9ad8bccfa9 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -63,16 +63,16 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDate> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTextCodec> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QDate> +#include <QDir> +#include <QFileInfo> +#include <QTextCodec> +#include <QtPlugin> +#include <QAction> +#include <QMainWindow> +#include <QMenu> +#include <QMessageBox> using namespace VcsBase; using namespace Core; diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp index 0b590866ee..37ac0cc15b 100644 --- a/src/plugins/cvs/cvssettings.cpp +++ b/src/plugins/cvs/cvssettings.cpp @@ -32,8 +32,8 @@ #include "cvssettings.h" -#include <QtCore/QSettings> -#include <QtCore/QTextStream> +#include <QSettings> +#include <QTextStream> static const char groupC[] = "CVS"; static const char commandKeyC[] = "Command"; diff --git a/src/plugins/cvs/cvssettings.h b/src/plugins/cvs/cvssettings.h index c335badc9b..f05225931f 100644 --- a/src/plugins/cvs/cvssettings.h +++ b/src/plugins/cvs/cvssettings.h @@ -33,7 +33,7 @@ #ifndef CVSSETTINGS_H #define CVSSETTINGS_H -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cvs/cvssubmiteditor.h b/src/plugins/cvs/cvssubmiteditor.h index 5cb02fd093..64a8b568d7 100644 --- a/src/plugins/cvs/cvssubmiteditor.h +++ b/src/plugins/cvs/cvssubmiteditor.h @@ -33,8 +33,8 @@ #ifndef CVSSUBMITEDITOR_H #define CVSSUBMITEDITOR_H -#include <QtCore/QPair> -#include <QtCore/QStringList> +#include <QPair> +#include <QStringList> #include <vcsbase/vcsbasesubmiteditor.h> diff --git a/src/plugins/cvs/cvsutils.cpp b/src/plugins/cvs/cvsutils.cpp index aca25ee0ab..4196eac41c 100644 --- a/src/plugins/cvs/cvsutils.cpp +++ b/src/plugins/cvs/cvsutils.cpp @@ -32,9 +32,9 @@ #include "cvsutils.h" -#include <QtCore/QDebug> -#include <QtCore/QRegExp> -#include <QtCore/QStringList> +#include <QDebug> +#include <QRegExp> +#include <QStringList> namespace Cvs { namespace Internal { diff --git a/src/plugins/cvs/cvsutils.h b/src/plugins/cvs/cvsutils.h index 229ae68914..d0130ab1d9 100644 --- a/src/plugins/cvs/cvsutils.h +++ b/src/plugins/cvs/cvsutils.h @@ -35,8 +35,8 @@ #include "cvssubmiteditor.h" -#include <QtCore/QString> -#include <QtCore/QList> +#include <QString> +#include <QList> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp index 13c3a51850..8cfadc2fc7 100644 --- a/src/plugins/cvs/settingspage.cpp +++ b/src/plugins/cvs/settingspage.cpp @@ -39,9 +39,9 @@ #include <vcsbase/vcsbaseconstants.h> #include <utils/pathchooser.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QTextStream> -#include <QtGui/QFileDialog> +#include <QCoreApplication> +#include <QTextStream> +#include <QFileDialog> using namespace Cvs::Internal; using namespace Utils; diff --git a/src/plugins/cvs/settingspage.h b/src/plugins/cvs/settingspage.h index d069bcd348..36ffe2751f 100644 --- a/src/plugins/cvs/settingspage.h +++ b/src/plugins/cvs/settingspage.h @@ -37,9 +37,9 @@ #include <vcsbase/vcsbaseoptionspage.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> -#include <QtCore/QString> +#include <QWidget> +#include <QPointer> +#include <QString> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/debugger/basewindow.cpp b/src/plugins/debugger/basewindow.cpp index e23e320824..2db1971020 100644 --- a/src/plugins/debugger/basewindow.cpp +++ b/src/plugins/debugger/basewindow.cpp @@ -37,10 +37,10 @@ #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> +#include <QDebug> +#include <QContextMenuEvent> +#include <QHeaderView> +#include <QMenu> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/basewindow.h b/src/plugins/debugger/basewindow.h index b01ccdd584..5b42fad78c 100644 --- a/src/plugins/debugger/basewindow.h +++ b/src/plugins/debugger/basewindow.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_BASEWINDOW_H #define DEBUGGER_BASEWINDOW_H -#include <QtGui/QTreeView> +#include <QTreeView> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index c060d94308..815424e5be 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -46,9 +46,9 @@ #include "modeltest.h" #endif -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimerEvent> +#include <QDir> +#include <QFileInfo> +#include <QTimerEvent> #define BREAK_ASSERT(cond, action) if (cond) {} else { action; } //#define BREAK_ASSERT(cond, action) QTC_ASSERT(cond, action) diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index 2c6860928e..8c167ac094 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -35,10 +35,10 @@ #include "breakpoint.h" -#include <QtCore/QObject> -#include <QtCore/QAbstractTableModel> +#include <QObject> +#include <QAbstractTableModel> -#include <QtGui/QIcon> +#include <QIcon> ////////////////////////////////////////////////////////////////// // diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp index dd6706d417..9296365396 100644 --- a/src/plugins/debugger/breakpoint.cpp +++ b/src/plugins/debugger/breakpoint.cpp @@ -34,9 +34,9 @@ #include "utils/qtcassert.h" -#include <QtCore/QByteArray> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QByteArray> +#include <QDebug> +#include <QFileInfo> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h index 36357d0de3..c718c2531c 100644 --- a/src/plugins/debugger/breakpoint.h +++ b/src/plugins/debugger/breakpoint.h @@ -33,10 +33,10 @@ #ifndef DEBUGGER_BREAKPOINT_H #define DEBUGGER_BREAKPOINT_H -#include <QtCore/QDebug> -#include <QtCore/QList> -#include <QtCore/QMetaType> -#include <QtCore/QString> +#include <QDebug> +#include <QList> +#include <QMetaType> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/breakpointmarker.cpp b/src/plugins/debugger/breakpointmarker.cpp index 1bd674094f..962c613889 100644 --- a/src/plugins/debugger/breakpointmarker.cpp +++ b/src/plugins/debugger/breakpointmarker.cpp @@ -34,7 +34,7 @@ #include "breakhandler.h" #include "debuggercore.h" -#include <QtGui/QIcon> +#include <QIcon> ////////////////////////////////////////////////////////////////// // diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp index 14c605bcd9..e2cf6d60fd 100644 --- a/src/plugins/debugger/breakwindow.cpp +++ b/src/plugins/debugger/breakwindow.cpp @@ -43,12 +43,12 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QAction> -#include <QtGui/QIntValidator> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QAction> +#include <QIntValidator> +#include <QKeyEvent> +#include <QMenu> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/cdb/bytearrayinputstream.h b/src/plugins/debugger/cdb/bytearrayinputstream.h index b85a4e3d5d..789497a7eb 100644 --- a/src/plugins/debugger/cdb/bytearrayinputstream.h +++ b/src/plugins/debugger/cdb/bytearrayinputstream.h @@ -33,8 +33,8 @@ #ifndef BYTEARRAYINPUTSTREAM_H #define BYTEARRAYINPUTSTREAM_H -#include <QtCore/QByteArray> -#include <QtCore/QString> +#include <QByteArray> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 55e45a7ef8..2a46d1c988 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -77,15 +77,15 @@ #include <cplusplus/CppDocument.h> #include <cplusplus/ModelManagerInterface.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QDateTime> -#include <QtGui/QToolTip> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QTextStream> +#include <QDateTime> +#include <QToolTip> +#include <QMainWindow> +#include <QMessageBox> #include <cctype> diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index c0194c5332..2f6a8421a7 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -36,14 +36,14 @@ #include "debuggerengine.h" #include "breakpoint.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QProcess> -#include <QtCore/QVariantList> -#include <QtCore/QMap> -#include <QtCore/QMultiHash> -#include <QtCore/QTime> -#include <QtCore/QPair> -#include <QtCore/QList> +#include <QSharedPointer> +#include <QProcess> +#include <QVariantList> +#include <QMap> +#include <QMultiHash> +#include <QTime> +#include <QPair> +#include <QList> namespace Utils { class ConsoleProcess; diff --git a/src/plugins/debugger/cdb/cdboptions.cpp b/src/plugins/debugger/cdb/cdboptions.cpp index 978af61f2f..46e7ac7beb 100644 --- a/src/plugins/debugger/cdb/cdboptions.cpp +++ b/src/plugins/debugger/cdb/cdboptions.cpp @@ -32,7 +32,7 @@ #include "cdboptions.h" -#include <QtCore/QSettings> +#include <QSettings> static const char settingsGroupC[] = "CDB2"; static const char symbolPathsKeyC[] = "SymbolPaths"; diff --git a/src/plugins/debugger/cdb/cdboptions.h b/src/plugins/debugger/cdb/cdboptions.h index 6405899d29..3e8ed9af63 100644 --- a/src/plugins/debugger/cdb/cdboptions.h +++ b/src/plugins/debugger/cdb/cdboptions.h @@ -33,7 +33,7 @@ #ifndef CDBSETTINGS_H #define CDBSETTINGS_H -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index cfd7edeaef..703ce95717 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -39,9 +39,9 @@ #include <coreplugin/icore.h> -#include <QtCore/QTextStream> -#include <QtGui/QLineEdit> -#include <QtGui/QCheckBox> +#include <QTextStream> +#include <QLineEdit> +#include <QCheckBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h index b010777c6a..0f4bf4b229 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.h +++ b/src/plugins/debugger/cdb/cdboptionspage.h @@ -38,9 +38,9 @@ #include <coreplugin/dialogs/ioptionspage.h> #include "ui_cdboptionspagewidget.h" -#include <QtGui/QWidget> -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> +#include <QWidget> +#include <QPointer> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp index bff8517685..b554938cb6 100644 --- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp +++ b/src/plugins/debugger/cdb/cdbparsehelpers.cpp @@ -41,11 +41,11 @@ #include <utils/qtcassert.h> -#include <QtCore/QByteArray> -#include <QtCore/QVariant> -#include <QtCore/QString> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QByteArray> +#include <QVariant> +#include <QString> +#include <QDir> +#include <QDebug> #include <cctype> diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.h b/src/plugins/debugger/cdb/cdbparsehelpers.h index 211abb9ebf..ea052c9b9e 100644 --- a/src/plugins/debugger/cdb/cdbparsehelpers.h +++ b/src/plugins/debugger/cdb/cdbparsehelpers.h @@ -35,11 +35,11 @@ #include "breakpoint.h" -#include <QtCore/QtGlobal> -#include <QtCore/QList> -#include <QtCore/QVector> -#include <QtCore/QPair> -#include <QtCore/QByteArray> +#include <QtGlobal> +#include <QList> +#include <QVector> +#include <QPair> +#include <QByteArray> QT_BEGIN_NAMESPACE class QVariant; diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index a25af57887..4718a1cc9f 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -43,8 +43,8 @@ #include <projectexplorer/projectexplorer.h> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> +#include <QFileInfo> +#include <QTextStream> using namespace Core; using namespace Debugger::Constants; diff --git a/src/plugins/debugger/commonoptionspage.h b/src/plugins/debugger/commonoptionspage.h index 1eb06d2486..6e683af4de 100644 --- a/src/plugins/debugger/commonoptionspage.h +++ b/src/plugins/debugger/commonoptionspage.h @@ -39,9 +39,9 @@ #include <coreplugin/dialogs/ioptionspage.h> #include <utils/savedaction.h> -#include <QtCore/QSharedPointer> -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QSharedPointer> +#include <QPointer> +#include <QWidget> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/consolewindow.cpp b/src/plugins/debugger/consolewindow.cpp index bdd33a7e98..3d33f2557a 100644 --- a/src/plugins/debugger/consolewindow.cpp +++ b/src/plugins/debugger/consolewindow.cpp @@ -36,14 +36,14 @@ #include "debuggeractions.h" #include "debuggercore.h" -#include <QtCore/QDebug> - -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QPlainTextEdit> +#include <QDebug> + +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QKeyEvent> +#include <QMenu> +#include <QSyntaxHighlighter> +#include <QPlainTextEdit> #include <aggregation/aggregate.h> #include <coreplugin/findplaceholder.h> diff --git a/src/plugins/debugger/consolewindow.h b/src/plugins/debugger/consolewindow.h index 51dffe217b..a4fcab0176 100644 --- a/src/plugins/debugger/consolewindow.h +++ b/src/plugins/debugger/consolewindow.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_CONSOLEWINDOW_H #define DEBUGGER_CONSOLEWINDOW_H -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QCursor; diff --git a/src/plugins/debugger/debugger_global.h b/src/plugins/debugger/debugger_global.h index f8b711d867..237f12d902 100644 --- a/src/plugins/debugger/debugger_global.h +++ b/src/plugins/debugger/debugger_global.h @@ -33,7 +33,7 @@ #ifndef DEBUGGERGLOBAL_H #define DEBUGGERGLOBAL_H -#include <QtCore/QtGlobal> +#include <QtGlobal> #if defined(DEBUGGER_LIBRARY) # define DEBUGGER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index bcb6482980..fe5a76ae82 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -39,9 +39,9 @@ #include <utils/qtcassert.h> #include <utils/pathchooser.h> -#include <QtCore/QDebug> -#include <QtCore/QVariant> -#include <QtCore/QSettings> +#include <QDebug> +#include <QVariant> +#include <QSettings> using namespace Utils; diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h index 081a11e6f2..d35c9ba39e 100644 --- a/src/plugins/debugger/debuggeractions.h +++ b/src/plugins/debugger/debuggeractions.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_ACTIONS_H #define DEBUGGER_ACTIONS_H -#include <QtCore/QHash> -#include <QtCore/QMap> +#include <QHash> +#include <QMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index b605e747c4..db6616f209 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -33,7 +33,7 @@ #ifndef DEBUGGERCONSTANTS_H #define DEBUGGERCONSTANTS_H -#include <QtCore/QFlags> +#include <QFlags> namespace Debugger { namespace Constants { diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h index 13688bbcec..d050f52e05 100644 --- a/src/plugins/debugger/debuggercore.h +++ b/src/plugins/debugger/debuggercore.h @@ -37,8 +37,8 @@ #include <projectexplorer/abi.h> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QIcon; diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 372dc85e91..530a2eee65 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -51,22 +51,22 @@ #include <utils/qtcassert.h> #include <utils/synchronousprocess.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QRegExp> - -#include <QtGui/QButtonGroup> -#include <QtGui/QFileDialog> -#include <QtGui/QGroupBox> -#include <QtGui/QHeaderView> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QRadioButton> -#include <QtGui/QScrollArea> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QStandardItemModel> -#include <QtGui/QGridLayout> +#include <QCoreApplication> +#include <QDebug> +#include <QDir> +#include <QRegExp> + +#include <QButtonGroup> +#include <QFileDialog> +#include <QGroupBox> +#include <QHeaderView> +#include <QMessageBox> +#include <QPushButton> +#include <QRadioButton> +#include <QScrollArea> +#include <QSortFilterProxyModel> +#include <QStandardItemModel> +#include <QGridLayout> using namespace Utils; diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h index 5b22dedb8d..1243c685b4 100644 --- a/src/plugins/debugger/debuggerdialogs.h +++ b/src/plugins/debugger/debuggerdialogs.h @@ -33,10 +33,10 @@ #ifndef DEBUGGER_DIALOGS_H #define DEBUGGER_DIALOGS_H -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtGui/QDialog> -#include <QtGui/QVBoxLayout> +#include <QHash> +#include <QStringList> +#include <QDialog> +#include <QVBoxLayout> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index dc70876025..888b8a1d52 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -66,13 +66,13 @@ #include <utils/savedaction.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QFutureInterface> +#include <QDebug> +#include <QTimer> +#include <QFile> +#include <QFileInfo> +#include <QFutureInterface> -#include <QtGui/QMessageBox> +#include <QMessageBox> using namespace Core; using namespace Debugger::Internal; diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index f9636328b5..312cb30e64 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -37,8 +37,8 @@ #include "debuggerconstants.h" #include "breakpoint.h" // For 'BreakpointId' -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/debugger/debuggerinternalconstants.h b/src/plugins/debugger/debuggerinternalconstants.h index 2b94fdf33c..5132fd328b 100644 --- a/src/plugins/debugger/debuggerinternalconstants.h +++ b/src/plugins/debugger/debuggerinternalconstants.h @@ -33,7 +33,7 @@ #ifndef DEBUGGERINTERNALCONSTANTS_H #define DEBUGGERINTERNALCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Debugger { namespace Constants { diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index a85426238e..c4486a624c 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -58,17 +58,17 @@ #include <projectexplorer/session.h> #include <projectexplorer/target.h> -#include <QtCore/QDebug> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QPair> -#include <QtCore/QSettings> - -#include <QtGui/QDockWidget> -#include <QtGui/QMenu> -#include <QtGui/QResizeEvent> -#include <QtGui/QStackedWidget> -#include <QtGui/QVBoxLayout> +#include <QDebug> +#include <QList> +#include <QMap> +#include <QPair> +#include <QSettings> + +#include <QDockWidget> +#include <QMenu> +#include <QResizeEvent> +#include <QStackedWidget> +#include <QVBoxLayout> using namespace Core; using namespace ProjectExplorer; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 5b7f7e0894..2917f3b698 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -116,24 +116,24 @@ #include <qml/qmljsscriptconsole.h> -#include <QtCore/QTimer> -#include <QtCore/QtPlugin> -#include <QtGui/QComboBox> -#include <QtGui/QDockWidget> -#include <QtGui/QFileDialog> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QToolButton> -#include <QtGui/QTreeWidget> -#include <QtGui/QInputDialog> +#include <QTimer> +#include <QtPlugin> +#include <QComboBox> +#include <QDockWidget> +#include <QFileDialog> +#include <QMenu> +#include <QMessageBox> +#include <QPushButton> +#include <QTextBlock> +#include <QTextCursor> +#include <QToolButton> +#include <QTreeWidget> +#include <QInputDialog> #ifdef WITH_TESTS -#include <QtTest/QTest> -#include <QtTest/QSignalSpy> -#include <QtTest/QTestEventLoop> +#include <QTest> +#include <QSignalSpy> +#include <QTestEventLoop> //#define WITH_BENCHMARK #ifdef WITH_BENCHMARK diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index e87a9268e1..5a1f4f4637 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -67,10 +67,10 @@ #include <coreplugin/icore.h> #include <utils/buildablehelperlibrary.h> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtGui/QMessageBox> -#include <QtGui/QErrorMessage> +#include <QDir> +#include <QDebug> +#include <QMessageBox> +#include <QErrorMessage> using namespace ProjectExplorer; using namespace Debugger::Internal; diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h index e28e2422d9..cbcc87b139 100644 --- a/src/plugins/debugger/debuggerrunner.h +++ b/src/plugins/debugger/debuggerrunner.h @@ -39,8 +39,8 @@ #include <projectexplorer/abi.h> #include <projectexplorer/runconfiguration.h> -#include <QtCore/QPair> -#include <QtCore/QStringList> +#include <QPair> +#include <QStringList> namespace Utils { class Environment; diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 500ae0c99b..1de7aeea54 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -35,20 +35,20 @@ #include <utils/pathchooser.h> #include <utils/qtcassert.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QTreeView> -#include <QtGui/QLineEdit> -#include <QtGui/QSpacerItem> -#include <QtGui/QPushButton> -#include <QtGui/QFormLayout> -#include <QtGui/QFileDialog> -#include <QtGui/QLabel> - -#include <QtCore/QDir> -#include <QtCore/QPair> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QTreeView> +#include <QLineEdit> +#include <QSpacerItem> +#include <QPushButton> +#include <QFormLayout> +#include <QFileDialog> +#include <QLabel> + +#include <QDir> +#include <QPair> // Qt's various build paths for unpatched versions. #if defined(Q_OS_WIN) diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.h b/src/plugins/debugger/debuggersourcepathmappingwidget.h index f842f6ef76..d2d8e52a94 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.h +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.h @@ -33,9 +33,9 @@ #ifndef DEBUGGERSOURCEPATHMAPPINGWIDGET_H #define DEBUGGERSOURCEPATHMAPPINGWIDGET_H -#include <QtGui/QGroupBox> -#include <QtCore/QMap> -#include <QtCore/QPair> +#include <QGroupBox> +#include <QMap> +#include <QPair> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index 859f24db86..6c556d222e 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -41,7 +41,7 @@ #include <projectexplorer/abi.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QMetaType> +#include <QMetaType> namespace Debugger { diff --git a/src/plugins/debugger/debuggerstreamops.cpp b/src/plugins/debugger/debuggerstreamops.cpp index cb813f9de0..cada0ea9d3 100644 --- a/src/plugins/debugger/debuggerstreamops.cpp +++ b/src/plugins/debugger/debuggerstreamops.cpp @@ -36,7 +36,7 @@ #include "watchdata.h" #include "disassemblerlines.h" -#include <QtCore/QDataStream> +#include <QDataStream> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/debuggerstringutils.h b/src/plugins/debugger/debuggerstringutils.h index 8cfbe29ec1..81346636e7 100644 --- a/src/plugins/debugger/debuggerstringutils.h +++ b/src/plugins/debugger/debuggerstringutils.h @@ -35,7 +35,7 @@ #ifndef qdoc -#include <QtCore/QString> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/debuggertoolchaincombobox.cpp b/src/plugins/debugger/debuggertoolchaincombobox.cpp index 3a164a4f13..7270d3e80d 100644 --- a/src/plugins/debugger/debuggertoolchaincombobox.cpp +++ b/src/plugins/debugger/debuggertoolchaincombobox.cpp @@ -37,11 +37,11 @@ #include <projectexplorer/abi.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QPair> +#include <QFileInfo> +#include <QDir> +#include <QPair> -#include <QtGui/QtEvents> +#include <QtEvents> typedef QPair<ProjectExplorer::Abi, QString> AbiDebuggerCommandPair; diff --git a/src/plugins/debugger/debuggertoolchaincombobox.h b/src/plugins/debugger/debuggertoolchaincombobox.h index 5f83b1cdb2..6501dedd2a 100644 --- a/src/plugins/debugger/debuggertoolchaincombobox.h +++ b/src/plugins/debugger/debuggertoolchaincombobox.h @@ -33,7 +33,7 @@ #ifndef DEBUGGERTOOLCHAINCOMBOBOX_H #define DEBUGGERTOOLCHAINCOMBOBOX_H -#include <QtGui/QComboBox> +#include <QComboBox> namespace ProjectExplorer { class Abi; diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index c9a6b7853a..d7ac689cd9 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -52,29 +52,29 @@ #include <utils/qtcassert.h> -#include <QtGui/QToolButton> -#include <QtGui/QToolBar> -#include <QtGui/QVBoxLayout> -#include <QtGui/QStyle> -#include <QtGui/QIcon> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QMoveEvent> -#include <QtGui/QDesktopWidget> -#include <QtGui/QScrollBar> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> -#include <QtGui/QLabel> -#include <QtGui/QClipboard> - -#include <QtCore/QVariant> -#include <QtCore/QStack> -#include <QtCore/QDebug> -#include <QtCore/QTimer> +#include <QToolButton> +#include <QToolBar> +#include <QVBoxLayout> +#include <QStyle> +#include <QIcon> +#include <QApplication> +#include <QMainWindow> +#include <QMoveEvent> +#include <QDesktopWidget> +#include <QScrollBar> +#include <QSortFilterProxyModel> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QPlainTextEdit> +#include <QTextCursor> +#include <QTextDocument> +#include <QLabel> +#include <QClipboard> + +#include <QVariant> +#include <QStack> +#include <QDebug> +#include <QTimer> using namespace Core; using namespace TextEditor; diff --git a/src/plugins/debugger/debuggertooltipmanager.h b/src/plugins/debugger/debuggertooltipmanager.h index b48e4466b7..8c995c622f 100644 --- a/src/plugins/debugger/debuggertooltipmanager.h +++ b/src/plugins/debugger/debuggertooltipmanager.h @@ -35,14 +35,14 @@ #include "debuggerconstants.h" -#include <QtGui/QTreeView> - -#include <QtCore/QPointer> -#include <QtCore/QPoint> -#include <QtCore/QList> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QDate> +#include <QTreeView> + +#include <QPointer> +#include <QPoint> +#include <QList> +#include <QXmlStreamWriter> +#include <QXmlStreamReader> +#include <QDate> QT_BEGIN_NAMESPACE class QVBoxLayout; diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index 940b2b1ad8..e8dabf52b5 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -53,11 +53,11 @@ #include <utils/qtcassert.h> -#include <QtGui/QTextBlock> -#include <QtGui/QIcon> -#include <QtCore/QPointer> -#include <QtCore/QPair> -#include <QtCore/QDir> +#include <QTextBlock> +#include <QIcon> +#include <QPointer> +#include <QPair> +#include <QDir> using namespace Core; using namespace TextEditor; diff --git a/src/plugins/debugger/disassembleragent.h b/src/plugins/debugger/disassembleragent.h index e65896dcc4..88365f5b84 100644 --- a/src/plugins/debugger/disassembleragent.h +++ b/src/plugins/debugger/disassembleragent.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_DISASSEMBLERAGENT_H #define DEBUGGER_DISASSEMBLERAGENT_H -#include <QtCore/QObject> +#include <QObject> namespace Debugger { diff --git a/src/plugins/debugger/disassemblerlines.cpp b/src/plugins/debugger/disassemblerlines.cpp index 45b9423b7c..a79632efb8 100644 --- a/src/plugins/debugger/disassemblerlines.cpp +++ b/src/plugins/debugger/disassemblerlines.cpp @@ -33,10 +33,10 @@ #include "disassemblerlines.h" #include "debuggerstringutils.h" -#include <QtCore/QDebug> -#include <QtCore/QRegExp> -#include <QtCore/QFile> -#include <QtCore/QTextStream> +#include <QDebug> +#include <QRegExp> +#include <QFile> +#include <QTextStream> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/disassemblerlines.h b/src/plugins/debugger/disassemblerlines.h index 4bd8ffef70..b67184c132 100644 --- a/src/plugins/debugger/disassemblerlines.h +++ b/src/plugins/debugger/disassemblerlines.h @@ -33,9 +33,9 @@ #ifndef DEBUGGER_DISASSEMBLERLINES_H #define DEBUGGER_DISASSEMBLERLINES_H -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QVector> +#include <QStringList> +#include <QHash> +#include <QVector> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.cpp b/src/plugins/debugger/gdb/abstractgdbadapter.cpp index 2003adebb5..c258ac7936 100644 --- a/src/plugins/debugger/gdb/abstractgdbadapter.cpp +++ b/src/plugins/debugger/gdb/abstractgdbadapter.cpp @@ -39,7 +39,7 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> -#include <QtCore/QProcess> +#include <QProcess> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.h b/src/plugins/debugger/gdb/abstractgdbadapter.h index 41365e2c9e..05410a9d61 100644 --- a/src/plugins/debugger/gdb/abstractgdbadapter.h +++ b/src/plugins/debugger/gdb/abstractgdbadapter.h @@ -38,7 +38,7 @@ // on invoking the first adapter callback in a *derived* adapter class. #include "gdbengine.h" -#include <QtCore/QObject> +#include <QObject> namespace Debugger { class DebuggerStartParameters; diff --git a/src/plugins/debugger/gdb/abstractgdbprocess.h b/src/plugins/debugger/gdb/abstractgdbprocess.h index 98c734c96f..310cd2bfaf 100644 --- a/src/plugins/debugger/gdb/abstractgdbprocess.h +++ b/src/plugins/debugger/gdb/abstractgdbprocess.h @@ -33,8 +33,8 @@ #ifndef GDBPROCESSWRAPPER_H #define GDBPROCESSWRAPPER_H -#include <QtCore/QObject> -#include <QtCore/QProcess> +#include <QObject> +#include <QProcess> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp index dca87aebc1..a9dd32c0a4 100644 --- a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp @@ -38,9 +38,9 @@ #include "debuggercore.h" #include "debuggerstringutils.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QTemporaryFile> +#include <QDir> +#include <QFile> +#include <QTemporaryFile> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp index 418a0dca6b..fd21906a51 100644 --- a/src/plugins/debugger/gdb/classicgdbengine.cpp +++ b/src/plugins/debugger/gdb/classicgdbengine.cpp @@ -46,9 +46,9 @@ #include <utils/savedaction.h> #include <utils/fileutils.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> +#include <QFile> +#include <QFileInfo> +#include <QMessageBox> #if !defined(Q_OS_WIN) #include <dlfcn.h> diff --git a/src/plugins/debugger/gdb/codagdbadapter.cpp b/src/plugins/debugger/gdb/codagdbadapter.cpp index 609777bd18..63f71674ff 100644 --- a/src/plugins/debugger/gdb/codagdbadapter.cpp +++ b/src/plugins/debugger/gdb/codagdbadapter.cpp @@ -54,10 +54,10 @@ #include <utils/savedaction.h> #include <utils/qtcprocess.h> -#include <QtCore/QTimer> -#include <QtCore/QDir> -#include <QtNetwork/QTcpServer> -#include <QtNetwork/QTcpSocket> +#include <QTimer> +#include <QDir> +#include <QTcpServer> +#include <QTcpSocket> #ifndef Q_OS_WIN # include <sys/types.h> diff --git a/src/plugins/debugger/gdb/codagdbadapter.h b/src/plugins/debugger/gdb/codagdbadapter.h index a6ecf7a331..d517cdedaf 100644 --- a/src/plugins/debugger/gdb/codagdbadapter.h +++ b/src/plugins/debugger/gdb/codagdbadapter.h @@ -39,10 +39,10 @@ #include "codautils.h" #include "symbian.h" -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QStringList> -#include <QtCore/QHash> +#include <QPointer> +#include <QSharedPointer> +#include <QStringList> +#include <QHash> QT_BEGIN_NAMESPACE class QTcpServer; diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp index 2bc0ca3f65..8a5b7a1e51 100644 --- a/src/plugins/debugger/gdb/coregdbadapter.cpp +++ b/src/plugins/debugger/gdb/coregdbadapter.cpp @@ -41,9 +41,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> +#include <QDir> +#include <QFileInfo> +#include <QMessageBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 92ba0f5795..07034fed92 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -77,22 +77,22 @@ #include <texteditor/itexteditor.h> #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QMetaObject> -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QTemporaryFile> -#include <QtCore/QTextStream> - -#include <QtGui/QAction> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLabel> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QCoreApplication> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QMetaObject> +#include <QTime> +#include <QTimer> +#include <QTemporaryFile> +#include <QTextStream> + +#include <QAction> +#include <QDialogButtonBox> +#include <QLabel> +#include <QMainWindow> +#include <QMessageBox> +#include <QPushButton> #ifdef Q_OS_UNIX #include <unistd.h> diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index f4de4e1f70..f8b8fc3df5 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -38,18 +38,18 @@ #include "stackframe.h" #include "watchutils.h" -#include <QtCore/QByteArray> -#include <QtCore/QProcess> -#include <QtCore/QHash> -#include <QtCore/QMap> -#include <QtCore/QMultiMap> -#include <QtCore/QObject> -#include <QtCore/QPoint> -#include <QtCore/QSet> -#include <QtCore/QTextCodec> -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QVariant> +#include <QByteArray> +#include <QProcess> +#include <QHash> +#include <QMap> +#include <QMultiMap> +#include <QObject> +#include <QPoint> +#include <QSet> +#include <QTextCodec> +#include <QTime> +#include <QTimer> +#include <QVariant> namespace Debugger { diff --git a/src/plugins/debugger/gdb/gdbmi.cpp b/src/plugins/debugger/gdb/gdbmi.cpp index 117e81122d..df721160e2 100644 --- a/src/plugins/debugger/gdb/gdbmi.cpp +++ b/src/plugins/debugger/gdb/gdbmi.cpp @@ -34,9 +34,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QByteArray> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> +#include <QByteArray> +#include <QRegExp> +#include <QTextStream> #include <ctype.h> diff --git a/src/plugins/debugger/gdb/gdbmi.h b/src/plugins/debugger/gdb/gdbmi.h index 9727f42764..5559db1d27 100644 --- a/src/plugins/debugger/gdb/gdbmi.h +++ b/src/plugins/debugger/gdb/gdbmi.h @@ -33,9 +33,9 @@ #ifndef DEBUGGER_GDBMI_H #define DEBUGGER_GDBMI_H -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QVariant> +#include <QByteArray> +#include <QList> +#include <QVariant> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp index 8705bd96e1..47da2f08fb 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.cpp +++ b/src/plugins/debugger/gdb/gdboptionspage.cpp @@ -38,19 +38,19 @@ #include <coreplugin/icore.h> #include <projectexplorer/projectexplorer.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> - -#include <QtGui/QCheckBox> -#include <QtGui/QFormLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QRadioButton> -#include <QtGui/QSpinBox> -#include <QtGui/QTextEdit> +#include <QCoreApplication> +#include <QDebug> +#include <QTextStream> + +#include <QCheckBox> +#include <QFormLayout> +#include <QGridLayout> +#include <QGroupBox> +#include <QLabel> +#include <QLineEdit> +#include <QRadioButton> +#include <QSpinBox> +#include <QTextEdit> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.cpp b/src/plugins/debugger/gdb/localplaingdbadapter.cpp index 3958a8945d..0b0060ffa6 100644 --- a/src/plugins/debugger/gdb/localplaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/localplaingdbadapter.cpp @@ -42,9 +42,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtGui/QMessageBox> +#include <QFileInfo> +#include <QProcess> +#include <QMessageBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/remotegdbprocess.cpp b/src/plugins/debugger/gdb/remotegdbprocess.cpp index 7de5675d3a..cc510c2f88 100644 --- a/src/plugins/debugger/gdb/remotegdbprocess.cpp +++ b/src/plugins/debugger/gdb/remotegdbprocess.cpp @@ -38,7 +38,7 @@ #include <utils/qtcprocess.h> #include <utils/ssh/sshconnectionmanager.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> #include <ctype.h> diff --git a/src/plugins/debugger/gdb/remotegdbprocess.h b/src/plugins/debugger/gdb/remotegdbprocess.h index a31e690b5d..b9888a5441 100644 --- a/src/plugins/debugger/gdb/remotegdbprocess.h +++ b/src/plugins/debugger/gdb/remotegdbprocess.h @@ -38,8 +38,8 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocess.h> -#include <QtCore/QByteArray> -#include <QtCore/QQueue> +#include <QByteArray> +#include <QQueue> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index 26ee53b9a2..9cd71bd3a9 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -43,8 +43,8 @@ #include <utils/fancymainwindow.h> #include <projectexplorer/abi.h> -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> +#include <QFileInfo> +#include <QMessageBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/symbian.cpp b/src/plugins/debugger/gdb/symbian.cpp index be333f05b9..d690077ba0 100644 --- a/src/plugins/debugger/gdb/symbian.cpp +++ b/src/plugins/debugger/gdb/symbian.cpp @@ -37,9 +37,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QTextStream> +#include <QFileInfo> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/symbian.h b/src/plugins/debugger/gdb/symbian.h index 4d22a10a44..0964368e05 100644 --- a/src/plugins/debugger/gdb/symbian.h +++ b/src/plugins/debugger/gdb/symbian.h @@ -33,11 +33,11 @@ #ifndef SYMBIANUTILS_H #define SYMBIANUTILS_H -#include <QtCore/QMap> -#include <QtCore/QByteArray> -#include <QtCore/QMetaType> -#include <QtCore/QVector> -#include <QtCore/QPair> +#include <QMap> +#include <QByteArray> +#include <QMetaType> +#include <QVector> +#include <QPair> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp index 080b0c1cac..8acff6ede4 100644 --- a/src/plugins/debugger/gdb/termgdbadapter.cpp +++ b/src/plugins/debugger/gdb/termgdbadapter.cpp @@ -43,7 +43,7 @@ #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtGui/QMessageBox> +#include <QMessageBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/guest/lldbengineguest.cpp b/src/plugins/debugger/lldb/guest/lldbengineguest.cpp index 3f43823557..2651c98eb0 100644 --- a/src/plugins/debugger/lldb/guest/lldbengineguest.cpp +++ b/src/plugins/debugger/lldb/guest/lldbengineguest.cpp @@ -50,11 +50,11 @@ #include "threadshandler.h" #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QProcess> -#include <QtCore/QFileInfo> -#include <QtCore/QThread> -#include <QtCore/QMutexLocker> +#include <QDebug> +#include <QProcess> +#include <QFileInfo> +#include <QThread> +#include <QMutexLocker> #include <lldb/API/LLDB.h> diff --git a/src/plugins/debugger/lldb/guest/lldbengineguest.h b/src/plugins/debugger/lldb/guest/lldbengineguest.h index 54aea5ab49..2b88f1344f 100644 --- a/src/plugins/debugger/lldb/guest/lldbengineguest.h +++ b/src/plugins/debugger/lldb/guest/lldbengineguest.h @@ -35,10 +35,10 @@ #include "ipcengineguest.h" -#include <QtCore/QQueue> -#include <QtCore/QVariant> -#include <QtCore/QThread> -#include <QtCore/QStringList> +#include <QQueue> +#include <QVariant> +#include <QThread> +#include <QStringList> #include <lldb/API/LLDB.h> diff --git a/src/plugins/debugger/lldb/guest/main.cpp b/src/plugins/debugger/lldb/guest/main.cpp index 8f26d2cd0c..a11d0ce9f5 100644 --- a/src/plugins/debugger/lldb/guest/main.cpp +++ b/src/plugins/debugger/lldb/guest/main.cpp @@ -32,10 +32,10 @@ #include "lldbengineguest.h" -#include <QtNetwork/QLocalSocket> -#include <QtCore/QCoreApplication> -#include <QtCore/QSocketNotifier> -#include <QtCore/QQueue> +#include <QLocalSocket> +#include <QCoreApplication> +#include <QSocketNotifier> +#include <QQueue> #include <cstdio> diff --git a/src/plugins/debugger/lldb/ipcengineguest.cpp b/src/plugins/debugger/lldb/ipcengineguest.cpp index d206e3376b..144382f175 100644 --- a/src/plugins/debugger/lldb/ipcengineguest.cpp +++ b/src/plugins/debugger/lldb/ipcengineguest.cpp @@ -39,12 +39,12 @@ #include <utils/qtcassert.h> -#include <QtNetwork/QLocalSocket> +#include <QLocalSocket> -#include <QtCore/QSysInfo> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> +#include <QSysInfo> +#include <QDebug> +#include <QFileInfo> +#include <QTimer> #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN #define SET_NATIVE_BYTE_ORDER(x) x.setByteOrder(QDataStream::LittleEndian) diff --git a/src/plugins/debugger/lldb/ipcengineguest.h b/src/plugins/debugger/lldb/ipcengineguest.h index d5cf4d29b6..4a5eb88a5b 100644 --- a/src/plugins/debugger/lldb/ipcengineguest.h +++ b/src/plugins/debugger/lldb/ipcengineguest.h @@ -39,9 +39,9 @@ #include "stackhandler.h" #include "threadshandler.h" -#include <QtCore/QQueue> -#include <QtCore/QThread> -#include <QtCore/QVariant> +#include <QQueue> +#include <QThread> +#include <QVariant> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/ipcenginehost.cpp b/src/plugins/debugger/lldb/ipcenginehost.cpp index 398e1ea931..1c6765f4fc 100644 --- a/src/plugins/debugger/lldb/ipcenginehost.cpp +++ b/src/plugins/debugger/lldb/ipcenginehost.cpp @@ -50,11 +50,11 @@ #include <utils/qtcassert.h> -#include <QtCore/QSysInfo> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> -#include <QtNetwork/QLocalSocket> +#include <QSysInfo> +#include <QDebug> +#include <QFileInfo> +#include <QTimer> +#include <QLocalSocket> #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN #define SET_NATIVE_BYTE_ORDER(x) x.setByteOrder(QDataStream::LittleEndian) diff --git a/src/plugins/debugger/lldb/ipcenginehost.h b/src/plugins/debugger/lldb/ipcenginehost.h index 61385a58c4..b75e1ceeaa 100644 --- a/src/plugins/debugger/lldb/ipcenginehost.h +++ b/src/plugins/debugger/lldb/ipcenginehost.h @@ -39,9 +39,9 @@ #include "breakhandler.h" #include "sourceagent.h" -#include <QtCore/QQueue> -#include <QtCore/QVariant> -#include <QtCore/QThread> +#include <QQueue> +#include <QVariant> +#include <QThread> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/lldbenginehost.cpp b/src/plugins/debugger/lldb/lldbenginehost.cpp index 7a0a9eec28..a80854111f 100644 --- a/src/plugins/debugger/lldb/lldbenginehost.cpp +++ b/src/plugins/debugger/lldb/lldbenginehost.cpp @@ -55,11 +55,11 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QProcess> -#include <QtCore/QFileInfo> -#include <QtCore/QThread> -#include <QtCore/QCoreApplication> +#include <QDebug> +#include <QProcess> +#include <QFileInfo> +#include <QThread> +#include <QCoreApplication> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/lldbenginehost.h b/src/plugins/debugger/lldb/lldbenginehost.h index 2c155c9d96..2978033849 100644 --- a/src/plugins/debugger/lldb/lldbenginehost.h +++ b/src/plugins/debugger/lldb/lldbenginehost.h @@ -39,8 +39,8 @@ #include <utils/ssh/sshremoteprocess.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QProcess> -#include <QtCore/QQueue> +#include <QProcess> +#include <QQueue> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/lldboptionspage.cpp b/src/plugins/debugger/lldb/lldboptionspage.cpp index 71f218fc46..35b9670ed6 100644 --- a/src/plugins/debugger/lldb/lldboptionspage.cpp +++ b/src/plugins/debugger/lldb/lldboptionspage.cpp @@ -36,11 +36,11 @@ #include <coreplugin/icore.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QUrl> -#include <QtCore/QTextStream> -#include <QtGui/QMessageBox> -#include <QtGui/QDesktopServices> +#include <QCoreApplication> +#include <QUrl> +#include <QTextStream> +#include <QMessageBox> +#include <QDesktopServices> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/lldboptionspage.h b/src/plugins/debugger/lldb/lldboptionspage.h index 41149885ed..4ef3b8db3c 100644 --- a/src/plugins/debugger/lldb/lldboptionspage.h +++ b/src/plugins/debugger/lldb/lldboptionspage.h @@ -36,10 +36,10 @@ #include <coreplugin/dialogs/ioptionspage.h> #include "ui_lldboptionspagewidget.h" -#include <QtGui/QWidget> -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QSettings> +#include <QWidget> +#include <QPointer> +#include <QSharedPointer> +#include <QSettings> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp index 2bf108892d..8c5a9fbd01 100644 --- a/src/plugins/debugger/logwindow.cpp +++ b/src/plugins/debugger/logwindow.cpp @@ -35,21 +35,21 @@ #include "debuggeractions.h" #include "debuggercore.h" -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QTime> - -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QSpacerItem> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QFile> +#include <QTime> + +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QLabel> +#include <QLineEdit> +#include <QKeyEvent> +#include <QMenu> +#include <QSpacerItem> +#include <QSyntaxHighlighter> +#include <QPlainTextEdit> +#include <QFileDialog> +#include <QMessageBox> #include <aggregation/aggregate.h> #include <coreplugin/findplaceholder.h> diff --git a/src/plugins/debugger/logwindow.h b/src/plugins/debugger/logwindow.h index 0d95dd6250..4bceac728f 100644 --- a/src/plugins/debugger/logwindow.h +++ b/src/plugins/debugger/logwindow.h @@ -35,7 +35,7 @@ #include "debuggerconstants.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QCursor; diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp index 2e64afd83c..96078d6c90 100644 --- a/src/plugins/debugger/memoryagent.cpp +++ b/src/plugins/debugger/memoryagent.cpp @@ -47,9 +47,9 @@ #include <extensionsystem/pluginmanager.h> #include <extensionsystem/invoker.h> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QVBoxLayout> +#include <QMessageBox> +#include <QMainWindow> +#include <QVBoxLayout> #include <cstring> diff --git a/src/plugins/debugger/memoryagent.h b/src/plugins/debugger/memoryagent.h index 48aefd2106..236061a7ab 100644 --- a/src/plugins/debugger/memoryagent.h +++ b/src/plugins/debugger/memoryagent.h @@ -35,11 +35,11 @@ #include "debuggerconstants.h" -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtGui/QColor> +#include <QObject> +#include <QPointer> +#include <QString> +#include <QList> +#include <QColor> QT_FORWARD_DECLARE_CLASS(QPoint) diff --git a/src/plugins/debugger/memoryview.cpp b/src/plugins/debugger/memoryview.cpp index e0d0afa46f..2857bac1b4 100644 --- a/src/plugins/debugger/memoryview.cpp +++ b/src/plugins/debugger/memoryview.cpp @@ -36,9 +36,9 @@ #include <bineditor/markup.h> -#include <QtGui/QVBoxLayout> -#include <QtCore/QModelIndex> -#include <QtCore/QDebug> +#include <QVBoxLayout> +#include <QModelIndex> +#include <QDebug> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/memoryview.h b/src/plugins/debugger/memoryview.h index 9f02c49682..623155760f 100644 --- a/src/plugins/debugger/memoryview.h +++ b/src/plugins/debugger/memoryview.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_INTERNAL_MEMORYVIEW_H #define DEBUGGER_INTERNAL_MEMORYVIEW_H -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QModelIndex) diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp index 4b6892617b..d7fa3413a9 100644 --- a/src/plugins/debugger/moduleshandler.cpp +++ b/src/plugins/debugger/moduleshandler.cpp @@ -34,8 +34,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtGui/QSortFilterProxyModel> +#include <QDebug> +#include <QSortFilterProxyModel> ////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/moduleshandler.h b/src/plugins/debugger/moduleshandler.h index 83386d9685..41f5c77cab 100644 --- a/src/plugins/debugger/moduleshandler.h +++ b/src/plugins/debugger/moduleshandler.h @@ -33,9 +33,9 @@ #ifndef DEBUGGER_MODULESHANDLER_H #define DEBUGGER_MODULESHANDLER_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QObject> -#include <QtCore/QVector> +#include <QAbstractItemModel> +#include <QObject> +#include <QVector> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp index d60d0789b9..6057188519 100644 --- a/src/plugins/debugger/moduleswindow.cpp +++ b/src/plugins/debugger/moduleswindow.cpp @@ -40,12 +40,12 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtCore/QProcess> +#include <QDebug> +#include <QProcess> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> -#include <QtGui/QResizeEvent> +#include <QHeaderView> +#include <QMenu> +#include <QResizeEvent> /////////////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/name_demangler.cpp b/src/plugins/debugger/name_demangler.cpp index 8b7023baab..73cdf628d6 100644 --- a/src/plugins/debugger/name_demangler.cpp +++ b/src/plugins/debugger/name_demangler.cpp @@ -32,12 +32,12 @@ #include "name_demangler.h" -#include <QtCore/QChar> -#include <QtCore/QMap> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QChar> +#include <QMap> +#include <QRegExp> +#include <QSet> +#include <QString> +#include <QStringList> // Debugging facility. //#define DO_TRACE diff --git a/src/plugins/debugger/name_demangler.h b/src/plugins/debugger/name_demangler.h index ed9a700864..9787c01408 100644 --- a/src/plugins/debugger/name_demangler.h +++ b/src/plugins/debugger/name_demangler.h @@ -33,7 +33,7 @@ #ifndef NAME_DEMANGLER_H #define NAME_DEMANGLER_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/debugger/outputcollector.cpp b/src/plugins/debugger/outputcollector.cpp index e194c65397..c621df176e 100644 --- a/src/plugins/debugger/outputcollector.cpp +++ b/src/plugins/debugger/outputcollector.cpp @@ -34,18 +34,18 @@ #ifdef Q_OS_WIN -#include <QtNetwork/QLocalServer> -#include <QtNetwork/QLocalSocket> -#include <QtCore/QCoreApplication> +#include <QLocalServer> +#include <QLocalSocket> +#include <QCoreApplication> #include <stdlib.h> #else -#include <QtCore/QFile> -#include <QtCore/QSocketNotifier> -#include <QtCore/QTemporaryFile> -#include <QtCore/QVarLengthArray> +#include <QFile> +#include <QSocketNotifier> +#include <QTemporaryFile> +#include <QVarLengthArray> #include <sys/ioctl.h> #include <sys/types.h> diff --git a/src/plugins/debugger/outputcollector.h b/src/plugins/debugger/outputcollector.h index ee695444ac..fee16bba5b 100644 --- a/src/plugins/debugger/outputcollector.h +++ b/src/plugins/debugger/outputcollector.h @@ -33,7 +33,7 @@ #ifndef OUTPUT_COLLECTOR_H #define OUTPUT_COLLECTOR_H -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QLocalServer; diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 2e43589bfe..72631e4b5b 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -57,16 +57,16 @@ #include <coreplugin/ifile.h> #include <coreplugin/icore.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> -#include <QtCore/QVariant> - -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtGui/QToolTip> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTimer> +#include <QVariant> + +#include <QApplication> +#include <QMessageBox> +#include <QToolTip> #define DEBUG_SCRIPT 1 diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index 13283e97fb..d1370b025a 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -35,9 +35,9 @@ #include "debuggerengine.h" -#include <QtCore/QProcess> -#include <QtCore/QQueue> -#include <QtCore/QVariant> +#include <QProcess> +#include <QQueue> +#include <QVariant> namespace Debugger { diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp index cb20e6e0b3..09b725b2b9 100644 --- a/src/plugins/debugger/procinterrupt.cpp +++ b/src/plugins/debugger/procinterrupt.cpp @@ -33,10 +33,10 @@ #include "procinterrupt.h" #include "debuggerconstants.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QProcess> // makes kill visible on Windows. -#include <QtCore/QFile> -#include <QtCore/QDir> +#include <QCoreApplication> +#include <QProcess> // makes kill visible on Windows. +#include <QFile> +#include <QDir> using namespace Debugger::Internal; diff --git a/src/plugins/debugger/procinterrupt.h b/src/plugins/debugger/procinterrupt.h index ec6f6f8a78..e25a883305 100644 --- a/src/plugins/debugger/procinterrupt.h +++ b/src/plugins/debugger/procinterrupt.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_PROCINTERRUPT_H #define DEBUGGER_PROCINTERRUPT_H -#include <QtCore/QString> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/interactiveinterpreter.h b/src/plugins/debugger/qml/interactiveinterpreter.h index 3e10a46610..b8e45ae736 100644 --- a/src/plugins/debugger/qml/interactiveinterpreter.h +++ b/src/plugins/debugger/qml/interactiveinterpreter.h @@ -36,9 +36,9 @@ #include <qmljs/parser/qmljslexer_p.h> #include <qmljs/parser/qmljsengine_p.h> -#include <QtCore/QVector> -#include <QtCore/QString> -#include <QtCore/QList> +#include <QVector> +#include <QString> +#include <QList> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp index f78a863331..d36b17f4fc 100644 --- a/src/plugins/debugger/qml/qmladapter.cpp +++ b/src/plugins/debugger/qml/qmladapter.cpp @@ -44,8 +44,8 @@ #include <qmljsdebugclient/qdebugmessageclient.h> -#include <QtCore/QTimer> -#include <QtCore/QDebug> +#include <QTimer> +#include <QDebug> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h index 59d5258d0c..9ec6dc9015 100644 --- a/src/plugins/debugger/qml/qmladapter.h +++ b/src/plugins/debugger/qml/qmladapter.h @@ -36,8 +36,8 @@ #include "debugger_global.h" #include "qmldebuggerclient.h" -#include <QtCore/QObject> -#include <QtNetwork/QAbstractSocket> +#include <QObject> +#include <QAbstractSocket> namespace QmlJsDebugClient { class QDeclarativeEngineDebug; diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index e657db4926..a326ee3b5f 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -40,8 +40,8 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QTimer> -#include <QtGui/QMainWindow> +#include <QTimer> +#include <QMainWindow> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 85c6bfc583..7a7b72c128 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -68,22 +68,22 @@ #include <texteditor/itexteditor.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QToolTip> -#include <QtGui/QTextDocument> - -#include <QtNetwork/QTcpSocket> -#include <QtNetwork/QHostAddress> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTimer> + +#include <QAction> +#include <QApplication> +#include <QMainWindow> +#include <QMessageBox> +#include <QPlainTextEdit> +#include <QToolTip> +#include <QTextDocument> + +#include <QTcpSocket> +#include <QHostAddress> #define DEBUG_QML 1 #if DEBUG_QML diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 07ef33559b..69e0de76ba 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -37,7 +37,7 @@ #include <utils/outputformat.h> -#include <QtNetwork/QAbstractSocket> +#include <QAbstractSocket> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/debugger/qml/qmljsscriptconsole.cpp b/src/plugins/debugger/qml/qmljsscriptconsole.cpp index 2325e80e6f..1579875bd2 100644 --- a/src/plugins/debugger/qml/qmljsscriptconsole.cpp +++ b/src/plugins/debugger/qml/qmljsscriptconsole.cpp @@ -52,12 +52,12 @@ #include <debugger/stackhandler.h> #include <debugger/stackframe.h> -#include <QtGui/QMenu> -#include <QtGui/QTextBlock> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QToolButton> -#include <QtGui/QCheckBox> +#include <QMenu> +#include <QTextBlock> +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QToolButton> +#include <QCheckBox> static const char SCRIPT_CONSOLE[] = "ScriptConsole"; static const char SHOW_LOG[] = "showLog"; diff --git a/src/plugins/debugger/qml/qmljsscriptconsole.h b/src/plugins/debugger/qml/qmljsscriptconsole.h index c42852d338..aef7b72401 100644 --- a/src/plugins/debugger/qml/qmljsscriptconsole.h +++ b/src/plugins/debugger/qml/qmljsscriptconsole.h @@ -35,7 +35,7 @@ #include <qmljsdebugclient/qdeclarativeenginedebug.h> #include <debugger/debuggerconstants.h> -#include <QtGui/QPlainTextEdit> +#include <QPlainTextEdit> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 9201a5d461..471eb42b76 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -44,14 +44,14 @@ #include <coreplugin/editormanager/editormanager.h> #include <texteditor/basetexteditor.h> -#include <QtGui/QTextBlock> -#include <QtCore/QVariant> -#include <QtCore/QStack> -#include <QtCore/QQueue> -#include <QtCore/QFileInfo> -#include <QtGui/QTextDocument> -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptValue> +#include <QTextBlock> +#include <QVariant> +#include <QStack> +#include <QQueue> +#include <QFileInfo> +#include <QTextDocument> +#include <QScriptEngine> +#include <QScriptValue> #define DEBUG_QML 0 #if DEBUG_QML diff --git a/src/plugins/debugger/registerhandler.h b/src/plugins/debugger/registerhandler.h index fad0f2e06a..f9f9f0eaad 100644 --- a/src/plugins/debugger/registerhandler.h +++ b/src/plugins/debugger/registerhandler.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_REGISTERHANDLER_H #define DEBUGGER_REGISTERHANDLER_H -#include <QtCore/QAbstractTableModel> -#include <QtCore/QVector> +#include <QAbstractTableModel> +#include <QVector> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp index 2325b7fc00..3ceedaaccc 100644 --- a/src/plugins/debugger/registerpostmortemaction.cpp +++ b/src/plugins/debugger/registerpostmortemaction.cpp @@ -38,9 +38,9 @@ #include "registryaccess.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QString> +#include <QCoreApplication> +#include <QDir> +#include <QString> #include <Windows.h> #include <Objbase.h> diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp index e07f61bf1a..b1c74c8b72 100644 --- a/src/plugins/debugger/registerwindow.cpp +++ b/src/plugins/debugger/registerwindow.cpp @@ -44,13 +44,13 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QHeaderView> -#include <QtGui/QItemDelegate> -#include <QtGui/QMenu> -#include <QtGui/QPainter> -#include <QtGui/QResizeEvent> +#include <QHeaderView> +#include <QItemDelegate> +#include <QMenu> +#include <QPainter> +#include <QResizeEvent> namespace Debugger { diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index d6ec3fd08f..b95b4ec697 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -54,23 +54,23 @@ #include <coreplugin/scriptmanager/scriptmanager.h> #include <coreplugin/icore.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> - -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtGui/QToolTip> - -#include <QtScript/QScriptContext> -#include <QtScript/QScriptClassPropertyIterator> -#include <QtScript/QScriptContextInfo> -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptEngineAgent> -#include <QtScript/QScriptValue> -#include <QtScript/QScriptValueIterator> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTimer> + +#include <QApplication> +#include <QMessageBox> +#include <QToolTip> + +#include <QScriptContext> +#include <QScriptClassPropertyIterator> +#include <QScriptContextInfo> +#include <QScriptEngine> +#include <QScriptEngineAgent> +#include <QScriptValue> +#include <QScriptValueIterator> namespace Debugger { diff --git a/src/plugins/debugger/script/scriptengine.h b/src/plugins/debugger/script/scriptengine.h index fa56c04067..df9bd7be99 100644 --- a/src/plugins/debugger/script/scriptengine.h +++ b/src/plugins/debugger/script/scriptengine.h @@ -35,9 +35,9 @@ #include "debuggerengine.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QScopedPointer> -#include <QtCore/QHash> +#include <QSharedPointer> +#include <QScopedPointer> +#include <QHash> QT_BEGIN_NAMESPACE class QScriptEngine; diff --git a/src/plugins/debugger/shared/backtrace.cpp b/src/plugins/debugger/shared/backtrace.cpp index 596fe313f3..2df2e68822 100644 --- a/src/plugins/debugger/shared/backtrace.cpp +++ b/src/plugins/debugger/shared/backtrace.cpp @@ -30,9 +30,9 @@ ** **************************************************************************/ -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QProcess> +#include <QCoreApplication> +#include <QDebug> +#include <QProcess> #if defined(Q_OS_LINUX) #include <stdio.h> diff --git a/src/plugins/debugger/shared/backtrace.h b/src/plugins/debugger/shared/backtrace.h index b391d96970..68bd7a2f94 100644 --- a/src/plugins/debugger/shared/backtrace.h +++ b/src/plugins/debugger/shared/backtrace.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_BACKTRACE_H #define DEBUGGER_BACKTRACE_H -#include <QtCore/qglobal.h> +#include <qglobal.h> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp index 98e1bd22f0..1368560f26 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp @@ -37,15 +37,15 @@ #include <utils/pathchooser.h> #include <utils/checkablemessagebox.h> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtGui/QFileDialog> -#include <QtGui/QAction> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QVBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QDir> +#include <QDebug> +#include <QFileDialog> +#include <QAction> +#include <QDialogButtonBox> +#include <QVBoxLayout> +#include <QFormLayout> +#include <QMessageBox> +#include <QMainWindow> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h index e4732e738e..0ae014ceb4 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h @@ -35,7 +35,7 @@ #include <utils/pathlisteditor.h> -#include <QtGui/QDialog> +#include <QDialog> namespace Utils { class PathChooser; diff --git a/src/plugins/debugger/shared/hostutils.cpp b/src/plugins/debugger/shared/hostutils.cpp index 84bc348f29..54ed87a23c 100644 --- a/src/plugins/debugger/shared/hostutils.cpp +++ b/src/plugins/debugger/shared/hostutils.cpp @@ -35,13 +35,13 @@ #include <utils/synchronousprocess.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QLibrary> -#include <QtCore/QProcess> -#include <QtCore/QString> -#include <QtCore/QTextStream> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QLibrary> +#include <QProcess> +#include <QString> +#include <QTextStream> #ifdef Q_OS_WIN diff --git a/src/plugins/debugger/shared/hostutils.h b/src/plugins/debugger/shared/hostutils.h index 3d00545f0e..98d85414e9 100644 --- a/src/plugins/debugger/shared/hostutils.h +++ b/src/plugins/debugger/shared/hostutils.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_HOSTUTILS_H #define DEBUGGER_HOSTUTILS_H -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp index 2c58a5c0a6..04bf69c4c0 100644 --- a/src/plugins/debugger/shared/peutils.cpp +++ b/src/plugins/debugger/shared/peutils.cpp @@ -33,8 +33,8 @@ #include "peutils.h" #include <utils/winutils.h> -#include <QtCore/QStringList> -#include <QtCore/QDebug> +#include <QStringList> +#include <QDebug> #include <climits> #include <windows.h> diff --git a/src/plugins/debugger/shared/peutils.h b/src/plugins/debugger/shared/peutils.h index 31523d0282..76de0bc65f 100644 --- a/src/plugins/debugger/shared/peutils.h +++ b/src/plugins/debugger/shared/peutils.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_PEUTILS_H #define DEBUGGER_PEUTILS_H -#include <QtCore/qnamespace.h> +#include <qnamespace.h> QT_BEGIN_NAMESPACE class QStringList; diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp index 92e3913e62..1f03891fef 100644 --- a/src/plugins/debugger/snapshothandler.cpp +++ b/src/plugins/debugger/snapshothandler.cpp @@ -41,9 +41,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtGui/QIcon> +#include <QDebug> +#include <QFile> +#include <QIcon> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/snapshothandler.h b/src/plugins/debugger/snapshothandler.h index aeb826c8ec..2e35ea4352 100644 --- a/src/plugins/debugger/snapshothandler.h +++ b/src/plugins/debugger/snapshothandler.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_SNAPSHOTHANDLER_H #define DEBUGGER_SNAPSHOTHANDLER_H -#include <QtCore/QAbstractTableModel> -#include <QtCore/QPointer> +#include <QAbstractTableModel> +#include <QPointer> namespace Debugger { diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp index 6e498c1268..e29b7c6b2e 100644 --- a/src/plugins/debugger/snapshotwindow.cpp +++ b/src/plugins/debugger/snapshotwindow.cpp @@ -41,11 +41,11 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> -#include <QtGui/QKeyEvent> +#include <QHeaderView> +#include <QMenu> +#include <QKeyEvent> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/sourceagent.cpp b/src/plugins/debugger/sourceagent.cpp index 8e4b88289f..93d09a2415 100644 --- a/src/plugins/debugger/sourceagent.cpp +++ b/src/plugins/debugger/sourceagent.cpp @@ -55,17 +55,17 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QMetaObject> -#include <QtCore/QTimer> -#include <QtCore/QPointer> -#include <QtCore/QFileInfo> - -#include <QtGui/QMessageBox> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QIcon> +#include <QDebug> +#include <QMetaObject> +#include <QTimer> +#include <QPointer> +#include <QFileInfo> + +#include <QMessageBox> +#include <QPlainTextEdit> +#include <QTextBlock> +#include <QTextCursor> +#include <QIcon> #include <limits.h> diff --git a/src/plugins/debugger/sourceagent.h b/src/plugins/debugger/sourceagent.h index 0fe487d496..020eda2ece 100644 --- a/src/plugins/debugger/sourceagent.h +++ b/src/plugins/debugger/sourceagent.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_SOURCE_AGENT_H #define DEBUGGER_SOURCE_AGENT_H -#include <QtCore/QObject> +#include <QObject> namespace Debugger { diff --git a/src/plugins/debugger/sourcefileshandler.cpp b/src/plugins/debugger/sourcefileshandler.cpp index ab7eae6203..2affe270f9 100644 --- a/src/plugins/debugger/sourcefileshandler.cpp +++ b/src/plugins/debugger/sourcefileshandler.cpp @@ -32,10 +32,10 @@ #include "sourcefileshandler.h" -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> -#include <QtGui/QSortFilterProxyModel> +#include <QSortFilterProxyModel> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/sourcefileshandler.h b/src/plugins/debugger/sourcefileshandler.h index 3edc8ff778..553277718b 100644 --- a/src/plugins/debugger/sourcefileshandler.h +++ b/src/plugins/debugger/sourcefileshandler.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_SOURCEFILESHANDLER_H #define DEBUGGER_SOURCEFILESHANDLER_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QStringList> +#include <QAbstractItemModel> +#include <QStringList> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp index 9bbd7df98c..e950ef4665 100644 --- a/src/plugins/debugger/sourcefileswindow.cpp +++ b/src/plugins/debugger/sourcefileswindow.cpp @@ -40,11 +40,11 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QMenu> +#include <QContextMenuEvent> +#include <QMenu> ////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/stackframe.cpp b/src/plugins/debugger/stackframe.cpp index 010651f487..6c4fdbb62a 100644 --- a/src/plugins/debugger/stackframe.cpp +++ b/src/plugins/debugger/stackframe.cpp @@ -32,11 +32,11 @@ #include "stackframe.h" -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QFileInfo> +#include <QDebug> +#include <QDir> +#include <QTextStream> +#include <QCoreApplication> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/stackframe.h b/src/plugins/debugger/stackframe.h index 6f76bd568b..6be47a7655 100644 --- a/src/plugins/debugger/stackframe.h +++ b/src/plugins/debugger/stackframe.h @@ -33,10 +33,10 @@ #ifndef DEBUGGER_STACKFRAME_H #define DEBUGGER_STACKFRAME_H -#include <QtCore/QList> -#include <QtCore/QMetaType> -#include <QtCore/QString> -#include <QtCore/QCoreApplication> +#include <QList> +#include <QMetaType> +#include <QString> +#include <QCoreApplication> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp index 2db4f0d026..00a3636761 100644 --- a/src/plugins/debugger/stackhandler.cpp +++ b/src/plugins/debugger/stackhandler.cpp @@ -39,8 +39,8 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/stackhandler.h b/src/plugins/debugger/stackhandler.h index 69848afb4f..b8c72b5305 100644 --- a/src/plugins/debugger/stackhandler.h +++ b/src/plugins/debugger/stackhandler.h @@ -35,7 +35,7 @@ #include "stackframe.h" -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp index 1e15027e4e..038440db88 100644 --- a/src/plugins/debugger/stackwindow.cpp +++ b/src/plugins/debugger/stackwindow.cpp @@ -42,14 +42,14 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> - -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QInputDialog> -#include <QtGui/QMenu> +#include <QDebug> + +#include <QApplication> +#include <QClipboard> +#include <QContextMenuEvent> +#include <QHeaderView> +#include <QInputDialog> +#include <QMenu> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/threaddata.h b/src/plugins/debugger/threaddata.h index 390f013334..ac9c1b655d 100644 --- a/src/plugins/debugger/threaddata.h +++ b/src/plugins/debugger/threaddata.h @@ -33,8 +33,8 @@ #ifndef THREADDATA_H #define THREADDATA_H -#include <QtCore/QVector> -#include <QtCore/QString> +#include <QVector> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp index 391db1f300..b8021d7982 100644 --- a/src/plugins/debugger/threadshandler.cpp +++ b/src/plugins/debugger/threadshandler.cpp @@ -36,9 +36,9 @@ #include "debuggerconstants.h" #include "debuggercore.h" -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtGui/QSortFilterProxyModel> +#include <QDebug> +#include <QTextStream> +#include <QSortFilterProxyModel> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/threadshandler.h b/src/plugins/debugger/threadshandler.h index 5ffec44fd2..4096245e98 100644 --- a/src/plugins/debugger/threadshandler.h +++ b/src/plugins/debugger/threadshandler.h @@ -33,8 +33,8 @@ #ifndef THREADSHANDLER_H #define THREADSHANDLER_H -#include <QtCore/QAbstractTableModel> -#include <QtGui/QIcon> +#include <QAbstractTableModel> +#include <QIcon> #include "threaddata.h" diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp index afbc1f2e1f..d3065fa0ab 100644 --- a/src/plugins/debugger/threadswindow.cpp +++ b/src/plugins/debugger/threadswindow.cpp @@ -40,10 +40,10 @@ #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> +#include <QDebug> +#include <QContextMenuEvent> +#include <QHeaderView> +#include <QMenu> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp index c5231422ad..4c67bec3c7 100644 --- a/src/plugins/debugger/watchdata.cpp +++ b/src/plugins/debugger/watchdata.cpp @@ -32,8 +32,8 @@ #include "watchdata.h" -#include <QtCore/QTextStream> -#include <QtCore/QDebug> +#include <QTextStream> +#include <QDebug> //////////////////////////////////////////////////////////////////// // diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h index fceb12b75c..8d675e7f08 100644 --- a/src/plugins/debugger/watchdata.h +++ b/src/plugins/debugger/watchdata.h @@ -33,9 +33,9 @@ #ifndef DEBUGGER_WATCHDATA_H #define DEBUGGER_WATCHDATA_H -#include <QtCore/QMetaType> -#include <QtCore/QtGlobal> -#include <QtCore/QCoreApplication> +#include <QMetaType> +#include <QtGlobal> +#include <QCoreApplication> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/watchdelegatewidgets.cpp b/src/plugins/debugger/watchdelegatewidgets.cpp index 0db19205f7..6eb21e0498 100644 --- a/src/plugins/debugger/watchdelegatewidgets.cpp +++ b/src/plugins/debugger/watchdelegatewidgets.cpp @@ -32,8 +32,8 @@ #include "watchdelegatewidgets.h" -#include <QtGui/QDoubleValidator> -#include <QtCore/QDebug> +#include <QDoubleValidator> +#include <QDebug> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/watchdelegatewidgets.h b/src/plugins/debugger/watchdelegatewidgets.h index eba042ef6e..44a5499507 100644 --- a/src/plugins/debugger/watchdelegatewidgets.h +++ b/src/plugins/debugger/watchdelegatewidgets.h @@ -33,9 +33,9 @@ #ifndef WATCHDELEGATEEDITS_H #define WATCHDELEGATEEDITS_H -#include <QtGui/QLineEdit> -#include <QtGui/QComboBox> -#include <QtCore/QVariant> +#include <QLineEdit> +#include <QComboBox> +#include <QVariant> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index b0434b92bd..5215cf8c47 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -49,15 +49,15 @@ #include <cplusplus/CppRewriter.h> -#include <QtCore/QDebug> -#include <QtCore/QEvent> -#include <QtCore/QFile> -#include <QtCore/QProcess> -#include <QtCore/QTextStream> -#include <QtCore/QtAlgorithms> - -#include <QtGui/QLabel> -#include <QtGui/QTextEdit> +#include <QDebug> +#include <QEvent> +#include <QFile> +#include <QProcess> +#include <QTextStream> +#include <QtAlgorithms> + +#include <QLabel> +#include <QTextEdit> #include <ctype.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h index 3922d6866e..5af4b463a4 100644 --- a/src/plugins/debugger/watchhandler.h +++ b/src/plugins/debugger/watchhandler.h @@ -35,11 +35,11 @@ #include "watchdata.h" -#include <QtCore/QPointer> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QStringList> -#include <QtCore/QAbstractItemModel> +#include <QPointer> +#include <QHash> +#include <QSet> +#include <QStringList> +#include <QAbstractItemModel> namespace Debugger { class DebuggerEngine; diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp index 9252822772..8b3672d08a 100644 --- a/src/plugins/debugger/watchutils.cpp +++ b/src/plugins/debugger/watchutils.cpp @@ -55,16 +55,16 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> -#include <QtCore/QTime> - -#include <QtGui/QTextCursor> -#include <QtGui/QPlainTextEdit> +#include <QCoreApplication> +#include <QDateTime> +#include <QDebug> +#include <QHash> +#include <QStringList> +#include <QTextStream> +#include <QTime> + +#include <QTextCursor> +#include <QPlainTextEdit> #include <string.h> #include <ctype.h> diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h index fb55038e46..d77f943ad2 100644 --- a/src/plugins/debugger/watchutils.h +++ b/src/plugins/debugger/watchutils.h @@ -32,8 +32,8 @@ #ifndef WATCHUTILS_H #define WATCHUTILS_H -#include <QtCore/QSet> -#include <QtCore/QString> +#include <QSet> +#include <QString> namespace TextEditor { class ITextEditor; diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp index e82aebdb3a..c773a62ef8 100644 --- a/src/plugins/debugger/watchwindow.cpp +++ b/src/plugins/debugger/watchwindow.cpp @@ -49,22 +49,22 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtCore/QMetaObject> -#include <QtCore/QMetaProperty> -#include <QtCore/QVariant> -#include <QtCore/QMimeData> - -#include <QtGui/QApplication> -#include <QtGui/QPalette> -#include <QtGui/QClipboard> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QItemDelegate> -#include <QtGui/QMenu> -#include <QtGui/QPainter> -#include <QtGui/QInputDialog> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QMetaObject> +#include <QMetaProperty> +#include <QVariant> +#include <QMimeData> + +#include <QApplication> +#include <QPalette> +#include <QClipboard> +#include <QContextMenuEvent> +#include <QHeaderView> +#include <QItemDelegate> +#include <QMenu> +#include <QPainter> +#include <QInputDialog> +#include <QMessageBox> ///////////////////////////////////////////////////////////////////// // diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp index c18d206c39..0cf6eb48df 100644 --- a/src/plugins/designer/codemodelhelpers.cpp +++ b/src/plugins/designer/codemodelhelpers.cpp @@ -48,8 +48,8 @@ #include <projectexplorer/session.h> #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QDebug> // Debug helpers for code model. @todo: Move to some CppTools library? diff --git a/src/plugins/designer/codemodelhelpers.h b/src/plugins/designer/codemodelhelpers.h index 5b2d6e7536..f6291c6184 100644 --- a/src/plugins/designer/codemodelhelpers.h +++ b/src/plugins/designer/codemodelhelpers.h @@ -33,7 +33,7 @@ #ifndef CODEMODELHELPERS_H #define CODEMODELHELPERS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/designer/cpp/cppsettingspage.cpp b/src/plugins/designer/cpp/cppsettingspage.cpp index e9c28d69c1..b55df33b80 100644 --- a/src/plugins/designer/cpp/cppsettingspage.cpp +++ b/src/plugins/designer/cpp/cppsettingspage.cpp @@ -33,8 +33,8 @@ #include "cppsettingspage.h" #include "designerconstants.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QTextStream> +#include <QCoreApplication> +#include <QTextStream> #include <coreplugin/icore.h> namespace Designer { diff --git a/src/plugins/designer/cpp/cppsettingspage.h b/src/plugins/designer/cpp/cppsettingspage.h index 1227ad0b7f..16b2fc689d 100644 --- a/src/plugins/designer/cpp/cppsettingspage.h +++ b/src/plugins/designer/cpp/cppsettingspage.h @@ -38,7 +38,7 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QPointer> +#include <QPointer> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp index fe5e5155d6..4e3c1e029c 100644 --- a/src/plugins/designer/cpp/formclasswizard.cpp +++ b/src/plugins/designer/cpp/formclasswizard.cpp @@ -40,8 +40,8 @@ #include <coreplugin/icore.h> #include <cppeditor/cppeditorconstants.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> +#include <QDebug> +#include <QSettings> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp index 815192e12e..6c6ea44c6a 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.cpp +++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp @@ -37,8 +37,8 @@ #include <coreplugin/basefilewizard.h> -#include <QtCore/QDebug> -#include <QtGui/QAbstractButton> +#include <QDebug> +#include <QAbstractButton> enum { FormPageId, ClassPageId }; diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp index ca489fd754..c0b2dddf18 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.cpp +++ b/src/plugins/designer/cpp/formclasswizardpage.cpp @@ -39,11 +39,11 @@ #include <cppeditor/cppeditorconstants.h> #include <cpptools/cpptoolsconstants.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> +#include <QDebug> +#include <QSettings> -#include <QtGui/QAbstractButton> -#include <QtGui/QMessageBox> +#include <QAbstractButton> +#include <QMessageBox> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h index 7fbbcacf28..b897d576de 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.h +++ b/src/plugins/designer/cpp/formclasswizardpage.h @@ -33,7 +33,7 @@ #ifndef FORMCLASSWIZARDPAGE_H #define FORMCLASSWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Designer { diff --git a/src/plugins/designer/cpp/formclasswizardparameters.h b/src/plugins/designer/cpp/formclasswizardparameters.h index 2a14f012f6..8a64ff186f 100644 --- a/src/plugins/designer/cpp/formclasswizardparameters.h +++ b/src/plugins/designer/cpp/formclasswizardparameters.h @@ -33,8 +33,8 @@ #ifndef FORMCLASSWIZARDPARAMETERS_H #define FORMCLASSWIZARDPARAMETERS_H -#include <QtCore/QString> -#include <QtCore/QMetaType> +#include <QString> +#include <QMetaType> namespace Designer { /* Parameters passed to generate the code part of a form class. diff --git a/src/plugins/designer/designer_export.h b/src/plugins/designer/designer_export.h index 5d2cd3f433..245d118f1c 100644 --- a/src/plugins/designer/designer_export.h +++ b/src/plugins/designer/designer_export.h @@ -33,7 +33,7 @@ #ifndef DESIGNER_EXPORT_H #define DESIGNER_EXPORT_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(DESIGNER_LIBRARY) # define DESIGNER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index 36063fc1ce..59d4fec04d 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -33,7 +33,7 @@ #ifndef DESIGNERPLUGIN_CONSTANTS_H #define DESIGNERPLUGIN_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Designer { namespace Constants { diff --git a/src/plugins/designer/designercontext.cpp b/src/plugins/designer/designercontext.cpp index c9c87824c4..8c75eb01e6 100644 --- a/src/plugins/designer/designercontext.cpp +++ b/src/plugins/designer/designercontext.cpp @@ -34,17 +34,17 @@ #include "designerconstants.h" #include "formeditorw.h" -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QDesignerFormEditorInterface> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerIntegration> +# include <QDesignerIntegration> #else # include "qt_private/qdesigner_integration_p.h" #endif -#include <QtGui/QWidget> -#include <QtCore/QDebug> -#include <QtCore/QSettings> +#include <QWidget> +#include <QDebug> +#include <QSettings> enum { debug = 0 }; diff --git a/src/plugins/designer/designercontext.h b/src/plugins/designer/designercontext.h index c04ae64fd7..6218230efd 100644 --- a/src/plugins/designer/designercontext.h +++ b/src/plugins/designer/designercontext.h @@ -35,7 +35,7 @@ #include <coreplugin/icontext.h> -#include <QtCore/QList> +#include <QList> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/designerxmleditor.cpp b/src/plugins/designer/designerxmleditor.cpp index f60bae1ebb..3a52efdf72 100644 --- a/src/plugins/designer/designerxmleditor.cpp +++ b/src/plugins/designer/designerxmleditor.cpp @@ -34,8 +34,8 @@ #include "formwindoweditor.h" #include "designerconstants.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtCore/QDebug> +#include <QDesignerFormWindowInterface> +#include <QDebug> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/editorwidget.cpp b/src/plugins/designer/editorwidget.cpp index edeb582b3b..4d7aaa062b 100644 --- a/src/plugins/designer/editorwidget.cpp +++ b/src/plugins/designer/editorwidget.cpp @@ -38,9 +38,9 @@ #include <utils/qtcassert.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDockWidget> -#include <QtGui/QAbstractItemView> +#include <QVBoxLayout> +#include <QDockWidget> +#include <QAbstractItemView> using namespace Designer::Constants; diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp index dec41b9076..a1a32a05be 100644 --- a/src/plugins/designer/formeditorfactory.cpp +++ b/src/plugins/designer/formeditorfactory.cpp @@ -44,8 +44,8 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/modemanager.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QFileInfo> +#include <QDebug> using namespace Designer::Constants; diff --git a/src/plugins/designer/formeditorfactory.h b/src/plugins/designer/formeditorfactory.h index 6123e96531..c0bf0c7b54 100644 --- a/src/plugins/designer/formeditorfactory.h +++ b/src/plugins/designer/formeditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index 0df6333acf..c90aaaca9a 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -51,14 +51,14 @@ #include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QDebug> -#include <QtCore/QLibraryInfo> -#include <QtCore/QTranslator> -#include <QtCore/QtPlugin> +#include <QDebug> +#include <QLibraryInfo> +#include <QTranslator> +#include <QtPlugin> #ifdef CPP_ENABLED -# include <QtGui/QWizard> -# include <QtGui/QMainWindow> +# include <QWizard> +# include <QMainWindow> #endif using namespace Designer::Internal; diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp index 6693e9a213..7e5d217538 100644 --- a/src/plugins/designer/formeditorstack.cpp +++ b/src/plugins/designer/formeditorstack.cpp @@ -43,14 +43,14 @@ #include <utils/qtcassert.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowManagerInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPropertyEditorInterface> - -#include <QtCore/QDebug> -#include <QtCore/QVariant> -#include <QtCore/QRect> +#include <QDesignerFormWindowInterface> +#include <QDesignerFormWindowManagerInterface> +#include <QDesignerFormEditorInterface> +#include <QDesignerPropertyEditorInterface> + +#include <QDebug> +#include <QVariant> +#include <QRect> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h index f1d5d2be59..29972516d5 100644 --- a/src/plugins/designer/formeditorstack.h +++ b/src/plugins/designer/formeditorstack.h @@ -35,9 +35,9 @@ #include "editordata.h" -#include <QtGui/QStackedWidget> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QStackedWidget> +#include <QList> +#include <QString> QT_BEGIN_NAMESPACE class QDesignerFormWindowInterface; diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 81b1b7a3f7..f5be9b430c 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -62,12 +62,12 @@ #include <cpptools/cpptoolsconstants.h> #include <utils/qtcassert.h> -#include <QtDesigner/QDesignerFormEditorPluginInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerComponents> +#include <QDesignerFormEditorPluginInterface> +#include <QDesignerFormEditorInterface> +#include <QDesignerComponents> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerFormWindowManagerInterface> +# include <QDesignerFormWindowManagerInterface> #else # include "qt_private/pluginmanager_p.h" # include "qt_private/iconloader_p.h" // createIconSet @@ -75,33 +75,33 @@ # include "qt_private/formwindowbase_p.h" #endif -#include <QtDesigner/QDesignerWidgetBoxInterface> -#include <QtDesigner/abstractobjectinspector.h> -#include <QtDesigner/QDesignerPropertyEditorInterface> -#include <QtDesigner/QDesignerActionEditorInterface> -#include <QtDesigner/QDesignerFormEditorInterface> - -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QApplication> -#include <QtGui/QCursor> -#include <QtGui/QDockWidget> -#include <QtGui/QMenu> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QKeySequence> -#include <QtGui/QPrintDialog> -#include <QtGui/QPrinter> -#include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QToolBar> -#include <QtGui/QVBoxLayout> - -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QSignalMapper> -#include <QtCore/QPluginLoader> -#include <QtCore/QTime> +#include <QDesignerWidgetBoxInterface> +#include <abstractobjectinspector.h> +#include <QDesignerPropertyEditorInterface> +#include <QDesignerActionEditorInterface> +#include <QDesignerFormEditorInterface> + +#include <QAction> +#include <QActionGroup> +#include <QApplication> +#include <QCursor> +#include <QDockWidget> +#include <QMenu> +#include <QMainWindow> +#include <QMessageBox> +#include <QKeySequence> +#include <QPrintDialog> +#include <QPrinter> +#include <QPainter> +#include <QStyle> +#include <QToolBar> +#include <QVBoxLayout> + +#include <QDebug> +#include <QSettings> +#include <QSignalMapper> +#include <QPluginLoader> +#include <QTime> static const char settingsGroupC[] = "Designer"; diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index 87d455a964..3a239579cb 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -38,9 +38,9 @@ #include <coreplugin/icontext.h> #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QMap> -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QMap> +#include <QObject> +#include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp index d05dc992cd..d6a946936c 100644 --- a/src/plugins/designer/formtemplatewizardpage.cpp +++ b/src/plugins/designer/formtemplatewizardpage.cpp @@ -35,25 +35,25 @@ #include "designerconstants.h" #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerNewFormWidgetInterface> +# include <QDesignerNewFormWidgetInterface> #else # include "qt_private/abstractnewformwidget_p.h" #endif -#include <QtCore/QDebug> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QByteArray> -#include <QtCore/QBuffer> +#include <QDebug> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QByteArray> +#include <QBuffer> -#include <QtGui/QVBoxLayout> -#include <QtGui/QMessageBox> -#include <QtGui/QAbstractButton> +#include <QVBoxLayout> +#include <QMessageBox> +#include <QAbstractButton> #ifdef USE_XSLT -# include <QtXmlPatterns/QXmlQuery> +# include <QXmlQuery> #else -# include <QtXml/QDomDocument> +# include <QDomDocument> #endif namespace Designer { diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h index e12a37b201..45c06b0b67 100644 --- a/src/plugins/designer/formtemplatewizardpage.h +++ b/src/plugins/designer/formtemplatewizardpage.h @@ -33,7 +33,7 @@ #ifndef FORMWIZARDPAGE_H #define FORMWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QDesignerNewFormWidgetInterface; diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index 9552fd7586..822b1b26a3 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/src/plugins/designer/formwindoweditor.cpp @@ -48,16 +48,16 @@ #include <utils/fileutils.h> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerFormWindowInterface> -# include <QtCore/QBuffer> +# include <QDesignerFormWindowInterface> +# include <QBuffer> #else # include "qt_private/formwindowbase_p.h" #endif -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtGui/QApplication> +#include <QDebug> +#include <QFileInfo> +#include <QFile> +#include <QApplication> namespace Designer { diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index 3defd2c1a6..985f5c6328 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/src/plugins/designer/formwindowfile.cpp @@ -38,22 +38,22 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowManagerInterface> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QDesignerFormWindowInterface> +#include <QDesignerFormWindowManagerInterface> +#include <QDesignerFormEditorInterface> #if QT_VERSION < 0x050000 # include "qt_private/qsimpleresource_p.h" #endif -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QUndoStack> +#include <QMessageBox> +#include <QMainWindow> +#include <QUndoStack> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QByteArray> -#include <QtCore/QDebug> -#include <QtCore/QTextCodec> +#include <QFile> +#include <QFileInfo> +#include <QByteArray> +#include <QDebug> +#include <QTextCodec> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index eb58152884..bf9eee1989 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -35,7 +35,7 @@ #include <coreplugin/textfile.h> -#include <QtCore/QPointer> +#include <QPointer> QT_BEGIN_NAMESPACE class QDesignerFormWindowInterface; diff --git a/src/plugins/designer/formwizard.cpp b/src/plugins/designer/formwizard.cpp index bae0a83ff1..9026b3dd66 100644 --- a/src/plugins/designer/formwizard.cpp +++ b/src/plugins/designer/formwizard.cpp @@ -36,7 +36,7 @@ #include "designerconstants.h" #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace Designer; using namespace Designer::Internal; diff --git a/src/plugins/designer/formwizarddialog.cpp b/src/plugins/designer/formwizarddialog.cpp index 949054bcf7..f379fd1951 100644 --- a/src/plugins/designer/formwizarddialog.cpp +++ b/src/plugins/designer/formwizarddialog.cpp @@ -39,8 +39,8 @@ #include <utils/filewizardpage.h> -#include <QtCore/QDebug> -#include <QtGui/QAbstractButton> +#include <QDebug> +#include <QAbstractButton> // Make sure there is a gap before the extension pages enum { FormPageId, FilePageId, FirstExtensionPageId = 10 }; diff --git a/src/plugins/designer/qt_private/abstractnewformwidget_p.h b/src/plugins/designer/qt_private/abstractnewformwidget_p.h index 3f87f6547c..e56c0859c8 100644 --- a/src/plugins/designer/qt_private/abstractnewformwidget_p.h +++ b/src/plugins/designer/qt_private/abstractnewformwidget_p.h @@ -44,9 +44,9 @@ #ifndef ABSTRACTNEWFORMWIDGET_H #define ABSTRACTNEWFORMWIDGET_H -#include <QtDesigner/sdk_global.h> +#include <sdk_global.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_HEADER diff --git a/src/plugins/designer/qt_private/abstractoptionspage_p.h b/src/plugins/designer/qt_private/abstractoptionspage_p.h index 3c19208950..487fa90107 100644 --- a/src/plugins/designer/qt_private/abstractoptionspage_p.h +++ b/src/plugins/designer/qt_private/abstractoptionspage_p.h @@ -44,7 +44,7 @@ #ifndef ABSTRACTOPTIONSPAGE_P_H #define ABSTRACTOPTIONSPAGE_P_H -#include <QtDesigner/sdk_global.h> +#include <sdk_global.h> QT_BEGIN_HEADER diff --git a/src/plugins/designer/qt_private/abstractsettings_p.h b/src/plugins/designer/qt_private/abstractsettings_p.h index 9447caae88..68be516879 100644 --- a/src/plugins/designer/qt_private/abstractsettings_p.h +++ b/src/plugins/designer/qt_private/abstractsettings_p.h @@ -44,7 +44,7 @@ #ifndef ABSTRACTSETTINGS_P_H #define ABSTRACTSETTINGS_P_H -#include <QtDesigner/sdk_global.h> +#include <sdk_global.h> #include <QVariant> diff --git a/src/plugins/designer/qt_private/formwindowbase_p.h b/src/plugins/designer/qt_private/formwindowbase_p.h index caa3037d15..f576a3bb05 100644 --- a/src/plugins/designer/qt_private/formwindowbase_p.h +++ b/src/plugins/designer/qt_private/formwindowbase_p.h @@ -46,10 +46,10 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QDesignerFormWindowInterface> -#include <QtCore/QVariantMap> -#include <QtCore/QList> +#include <QVariantMap> +#include <QList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/pluginmanager_p.h b/src/plugins/designer/qt_private/pluginmanager_p.h index 62f5969e85..c627f1f970 100644 --- a/src/plugins/designer/qt_private/pluginmanager_p.h +++ b/src/plugins/designer/qt_private/pluginmanager_p.h @@ -47,10 +47,10 @@ #include "shared_global_p.h" #include "shared_enums_p.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QMap> -#include <QtCore/QPair> -#include <QtCore/QStringList> +#include <QSharedDataPointer> +#include <QMap> +#include <QPair> +#include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h index 12b939320c..3118353e0b 100644 --- a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h +++ b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h @@ -45,7 +45,7 @@ #define QDESIGNER_FORMWINDOMANAGER_H #include "shared_global_p.h" -#include <QtDesigner/QDesignerFormWindowManagerInterface> +#include <QDesignerFormWindowManagerInterface> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/qdesigner_integration_p.h b/src/plugins/designer/qt_private/qdesigner_integration_p.h index 0ac39ebc30..66f2fe87e1 100644 --- a/src/plugins/designer/qt_private/qdesigner_integration_p.h +++ b/src/plugins/designer/qt_private/qdesigner_integration_p.h @@ -45,9 +45,9 @@ #define QDESIGNER_INTEGRATION_H #include "shared_global_p.h" -#include <QtDesigner/QDesignerIntegrationInterface> +#include <QDesignerIntegrationInterface> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/qsimpleresource_p.h b/src/plugins/designer/qt_private/qsimpleresource_p.h index 30eafce1a9..810ab1b863 100644 --- a/src/plugins/designer/qt_private/qsimpleresource_p.h +++ b/src/plugins/designer/qt_private/qsimpleresource_p.h @@ -46,7 +46,7 @@ #include "shared_global_p.h" #include "abstractformbuilder.h" -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/qtresourcemodel_p.h b/src/plugins/designer/qt_private/qtresourcemodel_p.h index 7339a967dd..b44be27149 100644 --- a/src/plugins/designer/qt_private/qtresourcemodel_p.h +++ b/src/plugins/designer/qt_private/qtresourcemodel_p.h @@ -45,9 +45,9 @@ #define QTRESOURCEMODEL_H #include "shared_global_p.h" -#include <QtCore/QMap> -#include <QtCore/QObject> -#include <QtCore/QScopedPointer> +#include <QMap> +#include <QObject> +#include <QScopedPointer> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/shared_global_p.h b/src/plugins/designer/qt_private/shared_global_p.h index 1a6f745399..c682758c4d 100644 --- a/src/plugins/designer/qt_private/shared_global_p.h +++ b/src/plugins/designer/qt_private/shared_global_p.h @@ -44,7 +44,7 @@ #ifndef SHARED_GLOBAL_H #define SHARED_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #ifdef QT_DESIGNER_STATIC #define QDESIGNER_SHARED_EXTERN diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 205d9820bc..12788ea66a 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -63,15 +63,15 @@ #include <utils/qtcassert.h> #include <utils/fileutils.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QDesignerFormWindowInterface> +#include <QDesignerFormEditorInterface> -#include <QtGui/QMessageBox> +#include <QMessageBox> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QUrl> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QUrl> enum { indentation = 4 }; diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h index ba170bc550..87b52e5ca1 100644 --- a/src/plugins/designer/qtcreatorintegration.h +++ b/src/plugins/designer/qtcreatorintegration.h @@ -36,7 +36,7 @@ #include <cplusplus/ModelManagerInterface.h> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerIntegration> +# include <QDesignerIntegration> #else # include "qt_private/qdesigner_integration_p.h" #endif diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp index 3874da23b9..ba8752b25b 100644 --- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp +++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp @@ -38,11 +38,11 @@ #include <coreplugin/icore.h> #include <cpptools/abstracteditorsupport.h> -#include <QtCore/QTextStream> -#include <QtCore/QSettings> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QSharedData> +#include <QTextStream> +#include <QSettings> +#include <QFileInfo> +#include <QDebug> +#include <QSharedData> static const char uiMemberC[] = "ui"; static const char uiNamespaceC[] = "Ui"; diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.h b/src/plugins/designer/qtdesignerformclasscodegenerator.h index 4ce200a307..ffab76138b 100644 --- a/src/plugins/designer/qtdesignerformclasscodegenerator.h +++ b/src/plugins/designer/qtdesignerformclasscodegenerator.h @@ -33,9 +33,9 @@ #ifndef QTDESIGNERFORMCLASSCODEGENERATOR_H #define QTDESIGNERFORMCLASSCODEGENERATOR_H -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtCore/QObject> +#include <QString> +#include <QVariant> +#include <QObject> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index d9a329c5a9..b898e00542 100644 --- a/src/plugins/designer/resourcehandler.cpp +++ b/src/plugins/designer/resourcehandler.cpp @@ -40,7 +40,7 @@ #include <projectexplorer/session.h> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerFormWindowInterface> +# include <QDesignerFormWindowInterface> #else # include "qt_private/formwindowbase_p.h" # include "qt_private/qtresourcemodel_p.h" diff --git a/src/plugins/designer/resourcehandler.h b/src/plugins/designer/resourcehandler.h index 8c86ab8fb1..5acd1f6823 100644 --- a/src/plugins/designer/resourcehandler.h +++ b/src/plugins/designer/resourcehandler.h @@ -33,8 +33,8 @@ #ifndef RESOURCEHANDLER_H #define RESOURCEHANDLER_H -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> QT_BEGIN_NAMESPACE #if QT_VERSION >= 0x050000 diff --git a/src/plugins/designer/settingsmanager.cpp b/src/plugins/designer/settingsmanager.cpp index 8bdbc8f849..48bb48f642 100644 --- a/src/plugins/designer/settingsmanager.cpp +++ b/src/plugins/designer/settingsmanager.cpp @@ -36,8 +36,8 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QSettings> -#include <QtCore/QDebug> +#include <QSettings> +#include <QDebug> using namespace Designer::Internal; diff --git a/src/plugins/designer/settingsmanager.h b/src/plugins/designer/settingsmanager.h index 88e6bea621..523936bb9c 100644 --- a/src/plugins/designer/settingsmanager.h +++ b/src/plugins/designer/settingsmanager.h @@ -34,7 +34,7 @@ #define SETTINGSMANAGER_H #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerSettingsInterface> +# include <QDesignerSettingsInterface> #else # include "qt_private/abstractsettings_p.h" #endif diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 4e43a57d21..12cdab0278 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -36,13 +36,13 @@ #include <extensionsystem/pluginmanager.h> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerOptionsPageInterface> +# include <QDesignerOptionsPageInterface> #else # include "qt_private/abstractoptionspage_p.h" #endif -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> using namespace Designer::Internal; diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp index d1e077192d..00bcaf4f48 100644 --- a/src/plugins/fakevim/fakevimactions.cpp +++ b/src/plugins/fakevim/fakevimactions.cpp @@ -40,16 +40,16 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QProcess> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> -#include <QtCore/QtAlgorithms> -#include <QtCore/QCoreApplication> -#include <QtCore/QStack> +#include <QDebug> +#include <QFile> +#include <QObject> +#include <QPointer> +#include <QProcess> +#include <QRegExp> +#include <QTextStream> +#include <QtAlgorithms> +#include <QCoreApplication> +#include <QStack> using namespace Utils; diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h index 85c1094d5c..c05f601f93 100644 --- a/src/plugins/fakevim/fakevimactions.h +++ b/src/plugins/fakevim/fakevimactions.h @@ -35,9 +35,9 @@ #include <utils/savedaction.h> -#include <QtCore/QHash> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QHash> +#include <QObject> +#include <QString> namespace FakeVim { namespace Internal { diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index e4196c0552..d418176f8b 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -64,27 +64,27 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QProcess> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> -#include <QtCore/QTimer> -#include <QtCore/QtAlgorithms> -#include <QtCore/QStack> - -#include <QtGui/QApplication> -#include <QtGui/QInputMethodEvent> -#include <QtGui/QKeyEvent> -#include <QtGui/QLineEdit> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QScrollBar> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocumentFragment> -#include <QtGui/QTextEdit> +#include <QDebug> +#include <QFile> +#include <QObject> +#include <QPointer> +#include <QProcess> +#include <QRegExp> +#include <QTextStream> +#include <QTimer> +#include <QtAlgorithms> +#include <QStack> + +#include <QApplication> +#include <QInputMethodEvent> +#include <QKeyEvent> +#include <QLineEdit> +#include <QPlainTextEdit> +#include <QScrollBar> +#include <QTextBlock> +#include <QTextCursor> +#include <QTextDocumentFragment> +#include <QTextEdit> #include <algorithm> #include <climits> diff --git a/src/plugins/fakevim/fakevimhandler.h b/src/plugins/fakevim/fakevimhandler.h index 66408e727d..6c0d25bb84 100644 --- a/src/plugins/fakevim/fakevimhandler.h +++ b/src/plugins/fakevim/fakevimhandler.h @@ -35,8 +35,8 @@ #include "fakevimactions.h" -#include <QtCore/QObject> -#include <QtGui/QTextEdit> +#include <QObject> +#include <QTextEdit> namespace FakeVim { namespace Internal { diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 56f3155e96..015d6ff47d 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -82,23 +82,23 @@ #include <cpptools/cpptoolsconstants.h> -#include <QtCore/QAbstractTableModel> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QtPlugin> -#include <QtCore/QObject> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> - -#include <QtGui/QDesktopServices> -#include <QtGui/QItemDelegate> -#include <QtGui/QMessageBox> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QShortcut> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QTextEdit> -#include <QtGui/QTreeWidgetItem> +#include <QAbstractTableModel> +#include <QDebug> +#include <QFile> +#include <QtPlugin> +#include <QObject> +#include <QSettings> +#include <QTextStream> + +#include <QDesktopServices> +#include <QItemDelegate> +#include <QMessageBox> +#include <QPlainTextEdit> +#include <QShortcut> +#include <QTextBlock> +#include <QTextCursor> +#include <QTextEdit> +#include <QTreeWidgetItem> using namespace FakeVim::Internal; using namespace TextEditor; diff --git a/src/plugins/find/basetextfind.cpp b/src/plugins/find/basetextfind.cpp index d991b3e086..e260af717f 100644 --- a/src/plugins/find/basetextfind.cpp +++ b/src/plugins/find/basetextfind.cpp @@ -35,11 +35,11 @@ #include <utils/qtcassert.h> #include <utils/filesearch.h> -#include <QtCore/QPointer> +#include <QPointer> -#include <QtGui/QTextBlock> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QTextCursor> +#include <QTextBlock> +#include <QPlainTextEdit> +#include <QTextCursor> namespace Find { diff --git a/src/plugins/find/currentdocumentfind.cpp b/src/plugins/find/currentdocumentfind.cpp index 5e9e0939b9..4a3bfa4bcb 100644 --- a/src/plugins/find/currentdocumentfind.cpp +++ b/src/plugins/find/currentdocumentfind.cpp @@ -36,9 +36,9 @@ #include <coreplugin/coreconstants.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtGui/QApplication> -#include <QtGui/QWidget> +#include <QDebug> +#include <QApplication> +#include <QWidget> using namespace Core; using namespace Find; diff --git a/src/plugins/find/currentdocumentfind.h b/src/plugins/find/currentdocumentfind.h index c127b38972..29e8c197e3 100644 --- a/src/plugins/find/currentdocumentfind.h +++ b/src/plugins/find/currentdocumentfind.h @@ -35,7 +35,7 @@ #include "ifindsupport.h" -#include <QtCore/QPointer> +#include <QPointer> namespace Find { namespace Internal { diff --git a/src/plugins/find/find_global.h b/src/plugins/find/find_global.h index e754e09f57..de1888eac7 100644 --- a/src/plugins/find/find_global.h +++ b/src/plugins/find/find_global.h @@ -32,7 +32,7 @@ #ifndef FIND_GLOBAL_H #define FIND_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(FIND_LIBRARY) # define FIND_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp index 28594de063..7efa527c42 100644 --- a/src/plugins/find/findplugin.cpp +++ b/src/plugins/find/findplugin.cpp @@ -51,12 +51,12 @@ #include <utils/qtcassert.h> -#include <QtGui/QMenu> -#include <QtGui/QStringListModel> -#include <QtGui/QAction> +#include <QMenu> +#include <QStringListModel> +#include <QAction> -#include <QtCore/QtPlugin> -#include <QtCore/QSettings> +#include <QtPlugin> +#include <QSettings> /*! \namespace Find diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp index fd4ae413bc..b4a54d4d6c 100644 --- a/src/plugins/find/findtoolbar.cpp +++ b/src/plugins/find/findtoolbar.cpp @@ -49,19 +49,19 @@ #include <utils/stylehelper.h> #include <utils/flowlayout.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> - -#include <QtGui/QClipboard> -#include <QtGui/QCompleter> -#include <QtGui/QKeyEvent> -#include <QtGui/QLineEdit> -#include <QtGui/QMenu> -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> -#include <QtGui/QPainter> -#include <QtGui/QPixmapCache> -#include <QtGui/QStringListModel> +#include <QDebug> +#include <QSettings> + +#include <QClipboard> +#include <QCompleter> +#include <QKeyEvent> +#include <QLineEdit> +#include <QMenu> +#include <QPushButton> +#include <QToolButton> +#include <QPainter> +#include <QPixmapCache> +#include <QStringListModel> Q_DECLARE_METATYPE(QStringList) Q_DECLARE_METATYPE(Find::IFindFilter*) diff --git a/src/plugins/find/findtoolbar.h b/src/plugins/find/findtoolbar.h index b985d3e10d..aa4f07e5b6 100644 --- a/src/plugins/find/findtoolbar.h +++ b/src/plugins/find/findtoolbar.h @@ -38,7 +38,7 @@ #include <utils/styledbar.h> -#include <QtCore/QTimer> +#include <QTimer> namespace Core { class FindToolBarPlaceHolder; diff --git a/src/plugins/find/findtoolwindow.cpp b/src/plugins/find/findtoolwindow.cpp index bd82e37623..38df4a52b5 100644 --- a/src/plugins/find/findtoolwindow.cpp +++ b/src/plugins/find/findtoolwindow.cpp @@ -35,12 +35,12 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtGui/QMainWindow> -#include <QtGui/QStringListModel> -#include <QtGui/QCompleter> -#include <QtGui/QKeyEvent> -#include <QtGui/QScrollArea> +#include <QSettings> +#include <QMainWindow> +#include <QStringListModel> +#include <QCompleter> +#include <QKeyEvent> +#include <QScrollArea> using namespace Find; using namespace Find::Internal; diff --git a/src/plugins/find/findtoolwindow.h b/src/plugins/find/findtoolwindow.h index e8011f95c5..928bbd0c56 100644 --- a/src/plugins/find/findtoolwindow.h +++ b/src/plugins/find/findtoolwindow.h @@ -36,7 +36,7 @@ #include "ui_finddialog.h" #include "ifindfilter.h" -#include <QtCore/QList> +#include <QList> QT_FORWARD_DECLARE_CLASS(QCompleter) diff --git a/src/plugins/find/ifindfilter.cpp b/src/plugins/find/ifindfilter.cpp index 56568119f7..fab80c3e7f 100644 --- a/src/plugins/find/ifindfilter.cpp +++ b/src/plugins/find/ifindfilter.cpp @@ -32,7 +32,7 @@ #include "ifindfilter.h" -#include <QtGui/QPainter> +#include <QPainter> /*! \class Find::IFindFilter diff --git a/src/plugins/find/ifindfilter.h b/src/plugins/find/ifindfilter.h index 6b05d786d9..f7460b4a09 100644 --- a/src/plugins/find/ifindfilter.h +++ b/src/plugins/find/ifindfilter.h @@ -36,7 +36,7 @@ #include "find_global.h" #include "textfindconstants.h" -#include <QtGui/QPixmap> +#include <QPixmap> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/find/ifindsupport.cpp b/src/plugins/find/ifindsupport.cpp index 8e4e588f6c..8531edeb77 100644 --- a/src/plugins/find/ifindsupport.cpp +++ b/src/plugins/find/ifindsupport.cpp @@ -32,11 +32,11 @@ #include "ifindsupport.h" -#include <QtCore/QTimer> -#include <QtCore/QPropertyAnimation> -#include <QtGui/QWidget> -#include <QtGui/QPaintEvent> -#include <QtGui/QPainter> +#include <QTimer> +#include <QPropertyAnimation> +#include <QWidget> +#include <QPaintEvent> +#include <QPainter> namespace Find { namespace Internal { diff --git a/src/plugins/find/ifindsupport.h b/src/plugins/find/ifindsupport.h index f43f2c2916..b5f4f2851d 100644 --- a/src/plugins/find/ifindsupport.h +++ b/src/plugins/find/ifindsupport.h @@ -36,8 +36,8 @@ #include "find_global.h" #include "textfindconstants.h" -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> namespace Find { diff --git a/src/plugins/find/searchresulttreeitemdelegate.cpp b/src/plugins/find/searchresulttreeitemdelegate.cpp index a07c9a13bb..f6150077aa 100644 --- a/src/plugins/find/searchresulttreeitemdelegate.cpp +++ b/src/plugins/find/searchresulttreeitemdelegate.cpp @@ -33,13 +33,13 @@ #include "searchresulttreeitemdelegate.h" #include "searchresulttreeitemroles.h" -#include <QtGui/QTextDocument> -#include <QtGui/QPainter> -#include <QtGui/QAbstractTextDocumentLayout> -#include <QtGui/QApplication> +#include <QTextDocument> +#include <QPainter> +#include <QAbstractTextDocumentLayout> +#include <QApplication> -#include <QtCore/QModelIndex> -#include <QtCore/QDebug> +#include <QModelIndex> +#include <QDebug> #include <math.h> diff --git a/src/plugins/find/searchresulttreeitemdelegate.h b/src/plugins/find/searchresulttreeitemdelegate.h index cb682714cf..a63b39b6d8 100644 --- a/src/plugins/find/searchresulttreeitemdelegate.h +++ b/src/plugins/find/searchresulttreeitemdelegate.h @@ -33,7 +33,7 @@ #ifndef SEARCHRESULTTREEITEMDELEGATE_H #define SEARCHRESULTTREEITEMDELEGATE_H -#include <QtGui/QItemDelegate> +#include <QItemDelegate> namespace Find { namespace Internal { diff --git a/src/plugins/find/searchresulttreeitemroles.h b/src/plugins/find/searchresulttreeitemroles.h index 22a1e48d00..8ef0d67809 100644 --- a/src/plugins/find/searchresulttreeitemroles.h +++ b/src/plugins/find/searchresulttreeitemroles.h @@ -33,7 +33,7 @@ #ifndef SEARCHRESULTTREEITEMROLES_H #define SEARCHRESULTTREEITEMROLES_H -#include <QtGui/QAbstractItemView> +#include <QAbstractItemView> namespace Find { namespace Internal { diff --git a/src/plugins/find/searchresulttreeitems.h b/src/plugins/find/searchresulttreeitems.h index cb505fb053..71381d17be 100644 --- a/src/plugins/find/searchresulttreeitems.h +++ b/src/plugins/find/searchresulttreeitems.h @@ -35,10 +35,10 @@ #include "searchresultwindow.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/qnamespace.h> -#include <QtGui/QIcon> +#include <QString> +#include <QList> +#include <qnamespace.h> +#include <QIcon> namespace Find { namespace Internal { diff --git a/src/plugins/find/searchresulttreemodel.cpp b/src/plugins/find/searchresulttreemodel.cpp index db8171c335..097fc1ff8c 100644 --- a/src/plugins/find/searchresulttreemodel.cpp +++ b/src/plugins/find/searchresulttreemodel.cpp @@ -34,15 +34,15 @@ #include "searchresulttreeitems.h" #include "searchresulttreeitemroles.h" -#include <QtGui/QApplication> -#include <QtGui/QFont> -#include <QtGui/QFontMetrics> -#include <QtGui/QColor> -#include <QtGui/QPalette> -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QApplication> +#include <QFont> +#include <QFontMetrics> +#include <QColor> +#include <QPalette> +#include <QTextDocument> +#include <QTextCursor> +#include <QDir> +#include <QDebug> using namespace Find; using namespace Find::Internal; diff --git a/src/plugins/find/searchresulttreemodel.h b/src/plugins/find/searchresulttreemodel.h index b3da7cfb92..bf64901073 100644 --- a/src/plugins/find/searchresulttreemodel.h +++ b/src/plugins/find/searchresulttreemodel.h @@ -35,10 +35,10 @@ #include "searchresultwindow.h" -#include <QtCore/QAbstractItemModel> -#include <QtCore/QRegExp> -#include <QtGui/QFont> -#include <QtGui/QTextDocument> +#include <QAbstractItemModel> +#include <QRegExp> +#include <QFont> +#include <QTextDocument> namespace Find { namespace Internal { diff --git a/src/plugins/find/searchresulttreeview.cpp b/src/plugins/find/searchresulttreeview.cpp index f52da380b1..9352f8af17 100644 --- a/src/plugins/find/searchresulttreeview.cpp +++ b/src/plugins/find/searchresulttreeview.cpp @@ -35,8 +35,8 @@ #include "searchresulttreemodel.h" #include "searchresulttreeitemdelegate.h" -#include <QtGui/QHeaderView> -#include <QtGui/QKeyEvent> +#include <QHeaderView> +#include <QKeyEvent> using namespace Find::Internal; diff --git a/src/plugins/find/searchresulttreeview.h b/src/plugins/find/searchresulttreeview.h index 90dbeca08d..28f373a762 100644 --- a/src/plugins/find/searchresulttreeview.h +++ b/src/plugins/find/searchresulttreeview.h @@ -35,7 +35,7 @@ #include "searchresultwindow.h" -#include <QtGui/QTreeView> +#include <QTreeView> namespace Find { namespace Internal { diff --git a/src/plugins/find/searchresultwidget.cpp b/src/plugins/find/searchresultwidget.cpp index 92fdfaac88..475b3a2bf5 100644 --- a/src/plugins/find/searchresultwidget.cpp +++ b/src/plugins/find/searchresultwidget.cpp @@ -40,10 +40,10 @@ #include <aggregation/aggregate.h> #include <coreplugin/icore.h> -#include <QtCore/QDir> -#include <QtCore/QSettings> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> +#include <QDir> +#include <QSettings> +#include <QVBoxLayout> +#include <QHBoxLayout> namespace Find { namespace Internal { diff --git a/src/plugins/find/searchresultwidget.h b/src/plugins/find/searchresultwidget.h index bb00a5bcfd..be03c3dc6a 100644 --- a/src/plugins/find/searchresultwidget.h +++ b/src/plugins/find/searchresultwidget.h @@ -37,10 +37,10 @@ #include <coreplugin/infobar.h> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QToolButton> -#include <QtGui/QWidget> +#include <QLabel> +#include <QLineEdit> +#include <QToolButton> +#include <QWidget> namespace Find { namespace Internal { diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index ca4ad77b5f..30daee7dbc 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -41,15 +41,15 @@ #include <coreplugin/icontext.h> #include <utils/qtcassert.h> -#include <QtCore/QFile> -#include <QtCore/QSettings> -#include <QtCore/QDebug> -#include <QtGui/QVBoxLayout> -#include <QtGui/QFont> -#include <QtGui/QAction> -#include <QtGui/QComboBox> -#include <QtGui/QScrollArea> -#include <QtGui/QStackedWidget> +#include <QFile> +#include <QSettings> +#include <QDebug> +#include <QVBoxLayout> +#include <QFont> +#include <QAction> +#include <QComboBox> +#include <QScrollArea> +#include <QStackedWidget> static const char SETTINGSKEYSECTIONNAME[] = "SearchResults"; static const char SETTINGSKEYEXPANDRESULTS[] = "ExpandResults"; diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h index 721c00e140..4a9d884143 100644 --- a/src/plugins/find/searchresultwindow.h +++ b/src/plugins/find/searchresultwindow.h @@ -37,9 +37,9 @@ #include <coreplugin/ioutputpane.h> -#include <QtCore/QVariant> -#include <QtCore/QStringList> -#include <QtGui/QIcon> +#include <QVariant> +#include <QStringList> +#include <QIcon> QT_BEGIN_NAMESPACE class QFont; diff --git a/src/plugins/find/textfindconstants.h b/src/plugins/find/textfindconstants.h index b64a40ea73..ab9f0bc92d 100644 --- a/src/plugins/find/textfindconstants.h +++ b/src/plugins/find/textfindconstants.h @@ -35,9 +35,9 @@ #include "find_global.h" -#include <QtCore/QMetaType> -#include <QtCore/QFlags> -#include <QtGui/QTextDocument> +#include <QMetaType> +#include <QFlags> +#include <QTextDocument> namespace Find { namespace Constants { diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp b/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp index e2f0959a1e..f66169ffd5 100644 --- a/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp +++ b/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp @@ -37,9 +37,9 @@ #include <coreplugin/mimedatabase.h> #include <coreplugin/icore.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QPushButton> +#include <QVBoxLayout> +#include <QLineEdit> +#include <QPushButton> using namespace GenericProjectManager; using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.h b/src/plugins/genericprojectmanager/filesselectionwizardpage.h index 4e102c96a5..6b034a7cf3 100644 --- a/src/plugins/genericprojectmanager/filesselectionwizardpage.h +++ b/src/plugins/genericprojectmanager/filesselectionwizardpage.h @@ -33,9 +33,9 @@ #ifndef FILESSELECTIONWIZARDPAGE_H #define FILESSELECTIONWIZARDPAGE_H -#include <QtGui/QWizardPage> -#include <QtGui/QLabel> -#include <QtGui/QTreeView> +#include <QWizardPage> +#include <QLabel> +#include <QTreeView> namespace GenericProjectManager { namespace Internal { diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index b9653e01bf..4988a9c621 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -41,7 +41,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcassert.h> -#include <QtGui/QInputDialog> +#include <QInputDialog> using namespace GenericProjectManager; using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index 9ca85172c3..5a6d782ee4 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -48,11 +48,11 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> -#include <QtGui/QFormLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QCheckBox> -#include <QtGui/QLineEdit> -#include <QtGui/QListWidget> +#include <QFormLayout> +#include <QGroupBox> +#include <QCheckBox> +#include <QLineEdit> +#include <QListWidget> using namespace GenericProjectManager; using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 2d0b53a5c4..df458b1284 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -51,12 +51,12 @@ #include <coreplugin/icontext.h> #include <coreplugin/filemanager.h> -#include <QtCore/QDir> -#include <QtCore/QProcessEnvironment> +#include <QDir> +#include <QProcessEnvironment> -#include <QtGui/QFormLayout> -#include <QtGui/QMainWindow> -#include <QtGui/QComboBox> +#include <QFormLayout> +#include <QMainWindow> +#include <QComboBox> using namespace GenericProjectManager; using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index 6e845f02e8..6a81adebab 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -45,7 +45,7 @@ #include <projectexplorer/buildconfiguration.h> #include <coreplugin/ifile.h> -#include <QtCore/QFuture> +#include <QFuture> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp index 51d14652fd..1e99b409e6 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp +++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp @@ -36,7 +36,7 @@ #include <coreplugin/ifile.h> #include <projectexplorer/projectexplorer.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace GenericProjectManager; using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h index dfef9d4e07..d7e6dc0ee9 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.h +++ b/src/plugins/genericprojectmanager/genericprojectnodes.h @@ -35,8 +35,8 @@ #include <projectexplorer/projectnodes.h> -#include <QtCore/QStringList> -#include <QtCore/QHash> +#include <QStringList> +#include <QHash> namespace Core { class IFile; diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp index fd7b1bea83..fd9b48f204 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp +++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp @@ -51,11 +51,11 @@ #include <texteditor/texteditoractionhandler.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> +#include <QtPlugin> +#include <QDebug> -#include <QtGui/QTreeView> -#include <QtGui/QMainWindow> +#include <QTreeView> +#include <QMainWindow> using namespace GenericProjectManager; using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.h b/src/plugins/genericprojectmanager/genericprojectplugin.h index fe18834903..277d219d55 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.h +++ b/src/plugins/genericprojectmanager/genericprojectplugin.h @@ -35,8 +35,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> -#include <QtGui/QAction> +#include <QObject> +#include <QAction> namespace ProjectExplorer { class Project; diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp index 24509999c7..75d2214de3 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp +++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp @@ -40,17 +40,17 @@ #include <utils/filewizardpage.h> -#include <QtGui/QIcon> +#include <QIcon> -#include <QtGui/QApplication> -#include <QtGui/QStyle> -#include <QtGui/QPainter> -#include <QtGui/QPixmap> +#include <QApplication> +#include <QStyle> +#include <QPainter> +#include <QPixmap> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QtDebug> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QFileInfo> +#include <QtDebug> +#include <QCoreApplication> using namespace GenericProjectManager::Internal; using namespace Utils; diff --git a/src/plugins/genericprojectmanager/generictarget.cpp b/src/plugins/genericprojectmanager/generictarget.cpp index 4b87c0b8f4..617acd279f 100644 --- a/src/plugins/genericprojectmanager/generictarget.cpp +++ b/src/plugins/genericprojectmanager/generictarget.cpp @@ -41,8 +41,8 @@ #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtGui/QApplication> -#include <QtGui/QStyle> +#include <QApplication> +#include <QStyle> const char GENERIC_DESKTOP_TARGET_DISPLAY_NAME[] = "Desktop"; diff --git a/src/plugins/genericprojectmanager/generictarget.h b/src/plugins/genericprojectmanager/generictarget.h index 896ab6d3cd..df2186a86a 100644 --- a/src/plugins/genericprojectmanager/generictarget.h +++ b/src/plugins/genericprojectmanager/generictarget.h @@ -37,8 +37,8 @@ #include "genericbuildconfiguration.h" -#include <QtCore/QStringList> -#include <QtCore/QVariantMap> +#include <QStringList> +#include <QVariantMap> namespace ProjectExplorer { class IBuildConfigurationFactory; diff --git a/src/plugins/genericprojectmanager/pkgconfigtool.cpp b/src/plugins/genericprojectmanager/pkgconfigtool.cpp index 27b7979e6f..ae32c0910c 100644 --- a/src/plugins/genericprojectmanager/pkgconfigtool.cpp +++ b/src/plugins/genericprojectmanager/pkgconfigtool.cpp @@ -32,9 +32,9 @@ #include "pkgconfigtool.h" -#include <QtCore/QProcess> -#include <QtCore/QTextStream> -#include <QtCore/QtDebug> +#include <QProcess> +#include <QTextStream> +#include <QtDebug> using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/pkgconfigtool.h b/src/plugins/genericprojectmanager/pkgconfigtool.h index 1c4ca138cb..34ba473ab9 100644 --- a/src/plugins/genericprojectmanager/pkgconfigtool.h +++ b/src/plugins/genericprojectmanager/pkgconfigtool.h @@ -33,8 +33,8 @@ #ifndef PKGCONFIGTOOL_H #define PKGCONFIGTOOL_H -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> namespace GenericProjectManager { namespace Internal { diff --git a/src/plugins/genericprojectmanager/selectablefilesmodel.cpp b/src/plugins/genericprojectmanager/selectablefilesmodel.cpp index 61320d81b3..26f2d7e23b 100644 --- a/src/plugins/genericprojectmanager/selectablefilesmodel.cpp +++ b/src/plugins/genericprojectmanager/selectablefilesmodel.cpp @@ -35,11 +35,11 @@ #include <coreplugin/fileiconprovider.h> #include <utils/QtConcurrentTools> -#include <QtGui/QHBoxLayout> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QTreeView> -#include <QtGui/QLineEdit> -#include <QtGui/QPushButton> +#include <QHBoxLayout> +#include <QDialogButtonBox> +#include <QTreeView> +#include <QLineEdit> +#include <QPushButton> using namespace GenericProjectManager; using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/selectablefilesmodel.h b/src/plugins/genericprojectmanager/selectablefilesmodel.h index ad5a83bdd3..d1e7c5f7d8 100644 --- a/src/plugins/genericprojectmanager/selectablefilesmodel.h +++ b/src/plugins/genericprojectmanager/selectablefilesmodel.h @@ -33,14 +33,14 @@ #ifndef SELECTABLEFILESMODEL_H #define SELECTABLEFILESMODEL_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QSet> -#include <QtCore/QFutureInterface> -#include <QtCore/QFutureWatcher> -#include <QtGui/QFileSystemModel> -#include <QtGui/QDialog> -#include <QtGui/QTreeView> -#include <QtGui/QLabel> +#include <QAbstractItemModel> +#include <QSet> +#include <QFutureInterface> +#include <QFutureWatcher> +#include <QFileSystemModel> +#include <QDialog> +#include <QTreeView> +#include <QLabel> namespace GenericProjectManager { namespace Internal { diff --git a/src/plugins/git/annotationhighlighter.cpp b/src/plugins/git/annotationhighlighter.cpp index 886f4d24c0..67550ca231 100644 --- a/src/plugins/git/annotationhighlighter.cpp +++ b/src/plugins/git/annotationhighlighter.cpp @@ -32,7 +32,7 @@ #include "annotationhighlighter.h" -#include <QtCore/QDebug> +#include <QDebug> namespace Git { namespace Internal { diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 1b4044312e..75d592612c 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -42,11 +42,11 @@ #include <utils/qtcassert.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> +#include <QItemSelectionModel> +#include <QPushButton> +#include <QMessageBox> -#include <QtCore/QDebug> +#include <QDebug> namespace Git { namespace Internal { diff --git a/src/plugins/git/branchdialog.h b/src/plugins/git/branchdialog.h index 64be62e6da..4fe52665ee 100644 --- a/src/plugins/git/branchdialog.h +++ b/src/plugins/git/branchdialog.h @@ -33,8 +33,8 @@ #ifndef BRANCHDIALOG_H #define BRANCHDIALOG_H -#include <QtGui/QDialog> -#include <QtGui/QItemSelection> +#include <QDialog> +#include <QItemSelection> QT_BEGIN_NAMESPACE class QPushButton; diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 20559c3fc0..7d14080f4c 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -36,9 +36,9 @@ #include <utils/qtcassert.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtGui/QFont> -#include <QtCore/QRegExp> -#include <QtCore/QTimer> +#include <QFont> +#include <QRegExp> +#include <QTimer> namespace Git { namespace Internal { diff --git a/src/plugins/git/branchmodel.h b/src/plugins/git/branchmodel.h index 8872b67008..b8eceb6203 100644 --- a/src/plugins/git/branchmodel.h +++ b/src/plugins/git/branchmodel.h @@ -33,9 +33,9 @@ #ifndef BRANCHMODEL_H #define BRANCHMODEL_H -#include <QtCore/QAbstractListModel> -#include <QtCore/QList> -#include <QtCore/QVariant> +#include <QAbstractListModel> +#include <QList> +#include <QVariant> namespace Git { namespace Internal { diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index e3e07d0631..62c4c35a10 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -32,8 +32,8 @@ #include "changeselectiondialog.h" -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QFileDialog> +#include <QMessageBox> namespace Git { namespace Internal { diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h index 898d54c455..0020cdc724 100644 --- a/src/plugins/git/changeselectiondialog.h +++ b/src/plugins/git/changeselectiondialog.h @@ -33,7 +33,7 @@ #ifndef CHANGESELECTIONDIALOG_H #define CHANGESELECTIONDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> #include "ui_changeselectiondialog.h" diff --git a/src/plugins/git/clonewizard.cpp b/src/plugins/git/clonewizard.cpp index a28348e238..46441dff47 100644 --- a/src/plugins/git/clonewizard.cpp +++ b/src/plugins/git/clonewizard.cpp @@ -41,7 +41,7 @@ #include <vcsbase/vcsconfigurationpage.h> #include <utils/qtcassert.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Git { namespace Internal { diff --git a/src/plugins/git/clonewizardpage.cpp b/src/plugins/git/clonewizardpage.cpp index ba6f441e9d..7bc78818e3 100644 --- a/src/plugins/git/clonewizardpage.cpp +++ b/src/plugins/git/clonewizardpage.cpp @@ -37,7 +37,7 @@ #include <vcsbase/checkoutjobs.h> #include <utils/qtcassert.h> -#include <QtGui/QCheckBox> +#include <QCheckBox> namespace Git { diff --git a/src/plugins/git/clonewizardpage.h b/src/plugins/git/clonewizardpage.h index 5d63fa95ae..6fc6129cc2 100644 --- a/src/plugins/git/clonewizardpage.h +++ b/src/plugins/git/clonewizardpage.h @@ -35,7 +35,7 @@ #include <vcsbase/basecheckoutwizardpage.h> -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace VcsBase { class AbstractCheckoutJob; diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp index d451791ba4..dc485e1410 100644 --- a/src/plugins/git/commitdata.cpp +++ b/src/plugins/git/commitdata.cpp @@ -33,9 +33,9 @@ #include "commitdata.h" #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QCoreApplication> +#include <QDebug> +#include <QRegExp> namespace Git { namespace Internal { diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index bdc27fb93c..1d469ff7cc 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -33,8 +33,8 @@ #ifndef COMMITDATA_H #define COMMITDATA_H -#include <QtCore/QStringList> -#include <QtCore/QPair> +#include <QStringList> +#include <QPair> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 1c4f06c013..9bf8a43440 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -65,18 +65,18 @@ #include <vcsbase/vcsbaseoutputwindow.h> #include <vcsbase/vcsbaseplugin.h> -#include <QtCore/QRegExp> -#include <QtCore/QTemporaryFile> -#include <QtCore/QTime> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QSignalMapper> - -#include <QtGui/QComboBox> -#include <QtGui/QMainWindow> // for msg box parent -#include <QtGui/QMessageBox> -#include <QtGui/QToolButton> -#include <QtCore/QTextCodec> +#include <QRegExp> +#include <QTemporaryFile> +#include <QTime> +#include <QFileInfo> +#include <QDir> +#include <QSignalMapper> + +#include <QComboBox> +#include <QMainWindow> // for msg box parent +#include <QMessageBox> +#include <QToolButton> +#include <QTextCodec> static const char GIT_DIRECTORY[] = ".git"; diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 651f8bd2b4..cb5b6ab600 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -38,10 +38,10 @@ #include <coreplugin/editormanager/ieditor.h> #include <vcsbase/command.h> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtGui/QWidget> +#include <QObject> +#include <QString> +#include <QStringList> +#include <QWidget> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h index 5bd3bf944b..fd3f59916e 100644 --- a/src/plugins/git/gitconstants.h +++ b/src/plugins/git/gitconstants.h @@ -33,7 +33,7 @@ #ifndef GIT_CONSTANTS_H #define GIT_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Git { namespace Constants { diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index e60ad3c344..aec04d9e5d 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -37,22 +37,22 @@ #include "gitplugin.h" #include "gitclient.h" #include "gitsettings.h" -#include <QtCore/QTextCodec> +#include <QTextCodec> #include <coreplugin/editormanager/editormanager.h> #include <utils/qtcassert.h> #include <vcsbase/diffhighlighter.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QTextStream> - -#include <QtGui/QTextCursor> -#include <QtGui/QTextEdit> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QRegExp> +#include <QSet> +#include <QTextStream> + +#include <QTextCursor> +#include <QTextEdit> +#include <QTextBlock> #define CHANGE_PATTERN_8C "[a-f0-9]{7,8}" #define CHANGE_PATTERN_40C "[a-f0-9]{40,40}" diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h index f254d4c94a..4ce7bf84a2 100644 --- a/src/plugins/git/giteditor.h +++ b/src/plugins/git/giteditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QtCore/QRegExp> +#include <QRegExp> QT_BEGIN_NAMESPACE class QVariant; diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp index 3d43330713..598d71ac29 100644 --- a/src/plugins/git/gitorious/gitorious.cpp +++ b/src/plugins/git/gitorious/gitorious.cpp @@ -32,12 +32,12 @@ #include "gitorious.h" -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QSettings> +#include <QDebug> +#include <QCoreApplication> +#include <QXmlStreamReader> +#include <QSettings> -#include <QtNetwork/QNetworkReply> +#include <QNetworkReply> #include <utils/qtcassert.h> #include <utils/networkaccessmanager.h> diff --git a/src/plugins/git/gitorious/gitorious.h b/src/plugins/git/gitorious/gitorious.h index 9f8793e3e6..f196109af2 100644 --- a/src/plugins/git/gitorious/gitorious.h +++ b/src/plugins/git/gitorious/gitorious.h @@ -33,10 +33,10 @@ #ifndef GITORIOUS_H #define GITORIOUS_H -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtCore/QUrl> -#include <QtCore/QObject> +#include <QStringList> +#include <QSharedPointer> +#include <QUrl> +#include <QObject> QT_BEGIN_NAMESPACE class QNetworkAccessManager; diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.cpp b/src/plugins/git/gitorious/gitoriousclonewizard.cpp index 6f6dea9299..9718493d1c 100644 --- a/src/plugins/git/gitorious/gitoriousclonewizard.cpp +++ b/src/plugins/git/gitorious/gitoriousclonewizard.cpp @@ -44,8 +44,8 @@ #include <vcsbase/vcsconfigurationpage.h> #include <utils/qtcassert.h> -#include <QtCore/QUrl> -#include <QtGui/QIcon> +#include <QUrl> +#include <QIcon> namespace Gitorious { namespace Internal { diff --git a/src/plugins/git/gitorious/gitorioushostwidget.cpp b/src/plugins/git/gitorious/gitorioushostwidget.cpp index 0ff7379b3d..332d85486e 100644 --- a/src/plugins/git/gitorious/gitorioushostwidget.cpp +++ b/src/plugins/git/gitorious/gitorioushostwidget.cpp @@ -36,16 +36,16 @@ #include <coreplugin/coreconstants.h> -#include <QtCore/QUrl> -#include <QtCore/QDebug> -#include <QtCore/QTimer> - -#include <QtGui/QStandardItem> -#include <QtGui/QStandardItemModel> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QDesktopServices> -#include <QtGui/QIcon> -#include <QtGui/QStyle> +#include <QUrl> +#include <QDebug> +#include <QTimer> + +#include <QStandardItem> +#include <QStandardItemModel> +#include <QItemSelectionModel> +#include <QDesktopServices> +#include <QIcon> +#include <QStyle> enum { debug = 0 }; diff --git a/src/plugins/git/gitorious/gitorioushostwidget.h b/src/plugins/git/gitorious/gitorioushostwidget.h index 032a8c4d7b..95db0b78a3 100644 --- a/src/plugins/git/gitorious/gitorioushostwidget.h +++ b/src/plugins/git/gitorious/gitorioushostwidget.h @@ -33,8 +33,8 @@ #ifndef GITORIOUSHOSTWIDGET_H #define GITORIOUSHOSTWIDGET_H -#include <QtGui/QWizardPage> -#include <QtGui/QStandardItemModel> +#include <QWizardPage> +#include <QStandardItemModel> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/git/gitorious/gitorioushostwizardpage.cpp b/src/plugins/git/gitorious/gitorioushostwizardpage.cpp index 4191945e40..8eb4621a79 100644 --- a/src/plugins/git/gitorious/gitorioushostwizardpage.cpp +++ b/src/plugins/git/gitorious/gitorioushostwizardpage.cpp @@ -37,8 +37,8 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtGui/QVBoxLayout> +#include <QSettings> +#include <QVBoxLayout> static const char settingsGroupC[] = "Gitorious"; static const char selectionKeyC[] = "/SelectedHost"; diff --git a/src/plugins/git/gitorious/gitorioushostwizardpage.h b/src/plugins/git/gitorious/gitorioushostwizardpage.h index f862461399..4af329a988 100644 --- a/src/plugins/git/gitorious/gitorioushostwizardpage.h +++ b/src/plugins/git/gitorious/gitorioushostwizardpage.h @@ -33,7 +33,7 @@ #ifndef GITORIOUSHOSTWIZARDPAGE_H #define GITORIOUSHOSTWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Gitorious { namespace Internal { diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp index 2fb3b110e6..e8e982b2d9 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp +++ b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp @@ -37,16 +37,16 @@ #include <utils/qtcassert.h> -#include <QtCore/QRegExp> -#include <QtCore/QDebug> +#include <QRegExp> +#include <QDebug> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QStandardItem> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QDesktopServices> -#include <QtGui/QIcon> -#include <QtGui/QStyle> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> +#include <QStandardItem> +#include <QItemSelectionModel> +#include <QDesktopServices> +#include <QIcon> +#include <QStyle> enum { urlRole = Qt::UserRole + 1 // Project has a URL in the description diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.h b/src/plugins/git/gitorious/gitoriousprojectwidget.h index d2832b6e91..957318eefa 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwidget.h +++ b/src/plugins/git/gitorious/gitoriousprojectwidget.h @@ -33,8 +33,8 @@ #ifndef GITORIOUSPROJECTWIDGET_H #define GITORIOUSPROJECTWIDGET_H -#include <QtCore/QSharedPointer> -#include <QtGui/QWidget> +#include <QSharedPointer> +#include <QWidget> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp index 96dfe08dfc..d0aaff5d74 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp +++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp @@ -37,8 +37,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QStackedWidget> -#include <QtGui/QVBoxLayout> +#include <QStackedWidget> +#include <QVBoxLayout> namespace Gitorious { namespace Internal { diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h index 035ec7f869..9802ec4fb6 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h +++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h @@ -33,8 +33,8 @@ #ifndef GITORIOUSPROJECTWIZARDPAGE_H #define GITORIOUSPROJECTWIZARDPAGE_H -#include <QtCore/QSharedPointer> -#include <QtGui/QWizardPage> +#include <QSharedPointer> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QStackedWidget; diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp index 8b1c693664..516b0d7432 100644 --- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp +++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp @@ -38,12 +38,12 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QSortFilterProxyModel> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QItemSelectionModel> +#include <QSortFilterProxyModel> enum { TypeRole = Qt::UserRole + 1}; enum { HeaderType, RepositoryType }; diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h index e6261a072f..c4df9e999a 100644 --- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h +++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h @@ -33,7 +33,7 @@ #ifndef GITORIOUSREPOSITORYWIZARDPAGE_H #define GITORIOUSREPOSITORYWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 43a7600b86..5da760b77c 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -70,17 +70,17 @@ #include <vcsbase/cleandialog.h> #include <locator/commandlocator.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTemporaryFile> -#include <QtCore/QtPlugin> - -#include <QtGui/QAction> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTemporaryFile> +#include <QtPlugin> + +#include <QAction> +#include <QFileDialog> +#include <QMainWindow> +#include <QMenu> +#include <QMessageBox> static const VcsBase::VcsBaseEditorParameters editorParameters[] = { { diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index bf5d34a245..e8c3d15f0c 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -40,12 +40,12 @@ #include <coreplugin/editormanager/ieditorfactory.h> #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> -#include <QtCore/QProcess> -#include <QtCore/QStringList> -#include <QtCore/QPointer> -#include <QtCore/QPair> -#include <QtCore/QVector> +#include <QObject> +#include <QProcess> +#include <QStringList> +#include <QPointer> +#include <QPair> +#include <QVector> QT_BEGIN_NAMESPACE class QFile; diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp index 31f289eb41..177d79a270 100644 --- a/src/plugins/git/gitsettings.cpp +++ b/src/plugins/git/gitsettings.cpp @@ -34,7 +34,7 @@ #include <utils/synchronousprocess.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitsettings.h b/src/plugins/git/gitsettings.h index e0c629ed74..e381dd014a 100644 --- a/src/plugins/git/gitsettings.h +++ b/src/plugins/git/gitsettings.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseclientsettings.h> -#include <QtCore/QStringList> +#include <QStringList> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index f55234d54b..6526f7202a 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -38,9 +38,9 @@ #include <utils/qtcassert.h> #include <vcsbase/submitfilemodel.h> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QTextCodec> +#include <QDebug> +#include <QStringList> +#include <QTextCodec> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h index 7ebd9b1700..39545818d9 100644 --- a/src/plugins/git/gitsubmiteditor.h +++ b/src/plugins/git/gitsubmiteditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbasesubmiteditor.h> -#include <QtCore/QStringList> +#include <QStringList> namespace VcsBase { class SubmitFileModel; diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index b0b649c1f8..b3e782698e 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -38,14 +38,14 @@ #include <texteditor/texteditorconstants.h> #include <utils/qtcassert.h> -#include <QtGui/QLineEdit> -#include <QtGui/QRegExpValidator> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextEdit> - -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QRegExp> +#include <QLineEdit> +#include <QRegExpValidator> +#include <QSyntaxHighlighter> +#include <QTextEdit> + +#include <QDebug> +#include <QDir> +#include <QRegExp> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitutils.cpp b/src/plugins/git/gitutils.cpp index 7c5d634ea6..e7424eff69 100644 --- a/src/plugins/git/gitutils.cpp +++ b/src/plugins/git/gitutils.cpp @@ -32,10 +32,10 @@ #include "gitutils.h" -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtGui/QInputDialog> -#include <QtGui/QLineEdit> +#include <QDebug> +#include <QStringList> +#include <QInputDialog> +#include <QLineEdit> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitutils.h b/src/plugins/git/gitutils.h index da696a31e9..cdce9b4425 100644 --- a/src/plugins/git/gitutils.h +++ b/src/plugins/git/gitutils.h @@ -33,7 +33,7 @@ #ifndef GITUTILS_H #define GITUTILS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index 2ac944385f..65f7e90f54 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -38,8 +38,8 @@ #include <utils/qtcassert.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> static const char stashMessageKeywordC[] = "IVersionControl@"; static const char stashRevisionIdC[] = "revision"; diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index 4d2d614b59..7fedd292e7 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -41,9 +41,9 @@ #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> +#include <QItemSelectionModel> +#include <QPushButton> +#include <QMessageBox> namespace Git { namespace Internal { diff --git a/src/plugins/git/remotedialog.h b/src/plugins/git/remotedialog.h index 7d70585d18..238555849f 100644 --- a/src/plugins/git/remotedialog.h +++ b/src/plugins/git/remotedialog.h @@ -33,7 +33,7 @@ #ifndef REMOTEDIALOG_H #define REMOTEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace Git { namespace Internal { diff --git a/src/plugins/git/remotemodel.h b/src/plugins/git/remotemodel.h index 363585e1ca..c189ffa690 100644 --- a/src/plugins/git/remotemodel.h +++ b/src/plugins/git/remotemodel.h @@ -33,9 +33,9 @@ #ifndef REMOTEMODEL_H #define REMOTEMODEL_H -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QVariant> +#include <QAbstractTableModel> +#include <QList> +#include <QVariant> namespace Git { namespace Internal { diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index e8ec9381bb..bcb3ecedd3 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -37,13 +37,13 @@ #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QProcessEnvironment> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfo> +#include <QDebug> +#include <QTextStream> +#include <QProcessEnvironment> +#include <QMessageBox> namespace Git { namespace Internal { diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h index 8a482e4126..28f178d2ad 100644 --- a/src/plugins/git/settingspage.h +++ b/src/plugins/git/settingspage.h @@ -33,8 +33,8 @@ #ifndef SETTINGSPAGE_H #define SETTINGSPAGE_H -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> #include <vcsbase/vcsbaseoptionspage.h> diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index 6f63aad0c8..60401364ee 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -39,15 +39,15 @@ #include <utils/qtcassert.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QModelIndex> -#include <QtCore/QDateTime> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QDir> +#include <QModelIndex> +#include <QDateTime> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> +#include <QItemSelectionModel> +#include <QMessageBox> +#include <QPushButton> enum { NameColumn, BranchColumn, MessageColumn, ColumnCount }; diff --git a/src/plugins/git/stashdialog.h b/src/plugins/git/stashdialog.h index 0c32328ed0..048a8e99e3 100644 --- a/src/plugins/git/stashdialog.h +++ b/src/plugins/git/stashdialog.h @@ -33,7 +33,7 @@ #ifndef STASHDIALOG_H #define STASHDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; diff --git a/src/plugins/glsleditor/glslautocompleter.cpp b/src/plugins/glsleditor/glslautocompleter.cpp index e25384e061..d318314a98 100644 --- a/src/plugins/glsleditor/glslautocompleter.cpp +++ b/src/plugins/glsleditor/glslautocompleter.cpp @@ -37,8 +37,8 @@ #include <cplusplus/MatchingText.h> #include <cplusplus/BackwardsScanner.h> -#include <QtCore/QLatin1Char> -#include <QtGui/QTextCursor> +#include <QLatin1Char> +#include <QTextCursor> using namespace GLSLEditor; using namespace Internal; diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp index adeaf79994..01c35d0e5f 100644 --- a/src/plugins/glsleditor/glslcompletionassist.cpp +++ b/src/plugins/glsleditor/glslcompletionassist.cpp @@ -52,14 +52,14 @@ #include <cplusplus/ExpressionUnderCursor.h> #include <utils/faketooltip.h> -#include <QtGui/QIcon> -#include <QtGui/QPainter> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> -#include <QtGui/QHBoxLayout> -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> -#include <QtCore/QDebug> +#include <QIcon> +#include <QPainter> +#include <QLabel> +#include <QToolButton> +#include <QHBoxLayout> +#include <QApplication> +#include <QDesktopWidget> +#include <QDebug> using namespace GLSLEditor; using namespace Internal; diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h index f3520e3be3..d0c134360f 100644 --- a/src/plugins/glsleditor/glslcompletionassist.h +++ b/src/plugins/glsleditor/glslcompletionassist.h @@ -40,8 +40,8 @@ #include <texteditor/codeassist/defaultassistinterface.h> #include <texteditor/codeassist/ifunctionhintproposalmodel.h> -#include <QtCore/QScopedPointer> -#include <QtGui/QIcon> +#include <QScopedPointer> +#include <QIcon> namespace GLSL { class Function; diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index cd9722ac92..6a6f9a1f69 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -65,18 +65,18 @@ #include <utils/changeset.h> #include <utils/uncommentselection.h> -#include <QtCore/QFileInfo> -#include <QtCore/QSignalMapper> -#include <QtCore/QTimer> -#include <QtCore/QDebug> - -#include <QtGui/QMenu> -#include <QtGui/QComboBox> -#include <QtGui/QHeaderView> -#include <QtGui/QInputDialog> -#include <QtGui/QMainWindow> -#include <QtGui/QToolBar> -#include <QtGui/QTreeView> +#include <QFileInfo> +#include <QSignalMapper> +#include <QTimer> +#include <QDebug> + +#include <QMenu> +#include <QComboBox> +#include <QHeaderView> +#include <QInputDialog> +#include <QMainWindow> +#include <QToolBar> +#include <QTreeView> using namespace GLSL; using namespace GLSLEditor; diff --git a/src/plugins/glsleditor/glsleditor.h b/src/plugins/glsleditor/glsleditor.h index 48ee84e052..99a81b06bd 100644 --- a/src/plugins/glsleditor/glsleditor.h +++ b/src/plugins/glsleditor/glsleditor.h @@ -37,8 +37,8 @@ #include <texteditor/basetexteditor.h> -#include <QtCore/QSharedPointer> -#include <QtCore/QSet> +#include <QSharedPointer> +#include <QSet> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/glsleditor/glsleditoractionhandler.cpp b/src/plugins/glsleditor/glsleditoractionhandler.cpp index 6c6c8c7dcb..2361045ac2 100644 --- a/src/plugins/glsleditor/glsleditoractionhandler.cpp +++ b/src/plugins/glsleditor/glsleditoractionhandler.cpp @@ -37,10 +37,10 @@ #include <coreplugin/icore.h> #include <coreplugin/actionmanager/actionmanager.h> -#include <QtCore/QDebug> -#include <QtGui/QAction> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QAction> +#include <QMainWindow> +#include <QMessageBox> namespace GLSLEditor { namespace Internal { diff --git a/src/plugins/glsleditor/glsleditorconstants.h b/src/plugins/glsleditor/glsleditorconstants.h index b023beda8d..9b8fbfe71d 100644 --- a/src/plugins/glsleditor/glsleditorconstants.h +++ b/src/plugins/glsleditor/glsleditorconstants.h @@ -33,7 +33,7 @@ #ifndef GLSLEDITOR_CONSTANTS_H #define GLSLEDITOR_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace GLSLEditor { namespace Constants { diff --git a/src/plugins/glsleditor/glsleditorfactory.cpp b/src/plugins/glsleditor/glsleditorfactory.cpp index 2f02f0bfdc..deadc5ea34 100644 --- a/src/plugins/glsleditor/glsleditorfactory.cpp +++ b/src/plugins/glsleditor/glsleditorfactory.cpp @@ -43,12 +43,12 @@ #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QMainWindow> +#include <QFileInfo> +#include <QDebug> +#include <QSettings> +#include <QMessageBox> +#include <QPushButton> +#include <QMainWindow> using namespace GLSLEditor::Internal; using namespace GLSLEditor::Constants; diff --git a/src/plugins/glsleditor/glsleditorfactory.h b/src/plugins/glsleditor/glsleditorfactory.h index 3cb89b60fc..e54128266b 100644 --- a/src/plugins/glsleditor/glsleditorfactory.h +++ b/src/plugins/glsleditor/glsleditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace GLSLEditor { namespace Internal { diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp index 55668acf70..769ad54fee 100644 --- a/src/plugins/glsleditor/glsleditorplugin.cpp +++ b/src/plugins/glsleditor/glsleditorplugin.cpp @@ -59,14 +59,14 @@ #include <glsl/glslparser.h> #include <glsl/glsllexer.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QDir> -#include <QtCore/QCoreApplication> -#include <QtCore/QTimer> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QDebug> +#include <QSettings> +#include <QDir> +#include <QCoreApplication> +#include <QTimer> +#include <QMenu> +#include <QAction> using namespace GLSLEditor; using namespace GLSLEditor::Internal; diff --git a/src/plugins/glsleditor/glsleditorplugin.h b/src/plugins/glsleditor/glsleditorplugin.h index 9f8f46ee02..4951cdeb46 100644 --- a/src/plugins/glsleditor/glsleditorplugin.h +++ b/src/plugins/glsleditor/glsleditorplugin.h @@ -36,7 +36,7 @@ #include <extensionsystem/iplugin.h> #include <coreplugin/icontext.h> #include <coreplugin/id.h> -#include <QtCore/QPointer> +#include <QPointer> #include <glsl/glsl.h> QT_FORWARD_DECLARE_CLASS(QAction) diff --git a/src/plugins/glsleditor/glslfilewizard.cpp b/src/plugins/glsleditor/glslfilewizard.cpp index 49dd40304c..18e3dfa6a9 100644 --- a/src/plugins/glsleditor/glslfilewizard.cpp +++ b/src/plugins/glsleditor/glslfilewizard.cpp @@ -37,10 +37,10 @@ #include <utils/qtcassert.h> #include <utils/filewizarddialog.h> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtGui/QWizard> -#include <QtGui/QPushButton> +#include <QFileInfo> +#include <QTextStream> +#include <QWizard> +#include <QPushButton> namespace { class GLSLFileWizardDialog : public Utils::FileWizardDialog diff --git a/src/plugins/glsleditor/glslhighlighter.cpp b/src/plugins/glsleditor/glslhighlighter.cpp index 1fbad7c53d..bf6a9695a8 100644 --- a/src/plugins/glsleditor/glslhighlighter.cpp +++ b/src/plugins/glsleditor/glslhighlighter.cpp @@ -36,7 +36,7 @@ #include <texteditor/basetextdocumentlayout.h> #include <texteditor/basetextdocument.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace GLSLEditor; using namespace GLSLEditor::Internal; diff --git a/src/plugins/glsleditor/glslhoverhandler.cpp b/src/plugins/glsleditor/glslhoverhandler.cpp index 28b864a456..bd7a30fbd0 100644 --- a/src/plugins/glsleditor/glslhoverhandler.cpp +++ b/src/plugins/glsleditor/glslhoverhandler.cpp @@ -41,8 +41,8 @@ #include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h> -#include <QtGui/QTextCursor> -#include <QtCore/QUrl> +#include <QTextCursor> +#include <QUrl> using namespace GLSLEditor; using namespace GLSLEditor::Internal; diff --git a/src/plugins/glsleditor/glslhoverhandler.h b/src/plugins/glsleditor/glslhoverhandler.h index a7b0b2408b..5ee46ccb04 100644 --- a/src/plugins/glsleditor/glslhoverhandler.h +++ b/src/plugins/glsleditor/glslhoverhandler.h @@ -35,7 +35,7 @@ #include <texteditor/basehoverhandler.h> -#include <QtCore/QObject> +#include <QObject> namespace Core { class IEditor; diff --git a/src/plugins/glsleditor/glslindenter.cpp b/src/plugins/glsleditor/glslindenter.cpp index 891fced168..c24fc3bca9 100644 --- a/src/plugins/glsleditor/glslindenter.cpp +++ b/src/plugins/glsleditor/glslindenter.cpp @@ -37,10 +37,10 @@ #include <cpptools/cppcodestylepreferences.h> #include <texteditor/tabsettings.h> -#include <QtCore/QChar> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> +#include <QChar> +#include <QTextDocument> +#include <QTextBlock> +#include <QTextCursor> using namespace GLSLEditor; using namespace Internal; diff --git a/src/plugins/glsleditor/reuse.cpp b/src/plugins/glsleditor/reuse.cpp index b71135d728..ed5f01a90f 100644 --- a/src/plugins/glsleditor/reuse.cpp +++ b/src/plugins/glsleditor/reuse.cpp @@ -32,7 +32,7 @@ #include "reuse.h" -#include <QtCore/QLatin1String> +#include <QLatin1String> #include <glsl/glsllexer.h> diff --git a/src/plugins/glsleditor/reuse.h b/src/plugins/glsleditor/reuse.h index eaa7f55921..ea2011ec93 100644 --- a/src/plugins/glsleditor/reuse.h +++ b/src/plugins/glsleditor/reuse.h @@ -33,7 +33,7 @@ #ifndef REUSE_H #define REUSE_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace GLSLEditor { namespace Internal { diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp index 7c6d3a9a94..025f926df2 100644 --- a/src/plugins/helloworld/helloworldplugin.cpp +++ b/src/plugins/helloworld/helloworldplugin.cpp @@ -40,12 +40,12 @@ #include <coreplugin/modemanager.h> #include <coreplugin/id.h> -#include <QtCore/QDebug> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QtPlugin> +#include <QAction> +#include <QMenu> +#include <QMessageBox> +#include <QPushButton> namespace HelloWorld { namespace Internal { diff --git a/src/plugins/helloworld/helloworldwindow.cpp b/src/plugins/helloworld/helloworldwindow.cpp index 39e585c8bd..fce2d45391 100644 --- a/src/plugins/helloworld/helloworldwindow.cpp +++ b/src/plugins/helloworld/helloworldwindow.cpp @@ -32,8 +32,8 @@ #include "helloworldwindow.h" -#include <QtGui/QTextEdit> -#include <QtGui/QVBoxLayout> +#include <QTextEdit> +#include <QVBoxLayout> using namespace HelloWorld::Internal; diff --git a/src/plugins/helloworld/helloworldwindow.h b/src/plugins/helloworld/helloworldwindow.h index e7be5783b5..6b9df951bc 100644 --- a/src/plugins/helloworld/helloworldwindow.h +++ b/src/plugins/helloworld/helloworldwindow.h @@ -33,7 +33,7 @@ #ifndef HELLOWORLDWINDOW_H #define HELLOWORLDWINDOW_H -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QLabel) diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp index 3692d48cee..60f9446d83 100644 --- a/src/plugins/help/centralwidget.cpp +++ b/src/plugins/help/centralwidget.cpp @@ -36,19 +36,19 @@ #include "localhelpmanager.h" #include "topicchooser.h" -#include <QtCore/QEvent> -#include <QtCore/QTimer> - -#include <QtGui/QKeyEvent> -#include <QtGui/QLayout> -#include <QtGui/QPageSetupDialog> -#include <QtGui/QPrinter> -#include <QtGui/QPrintDialog> -#include <QtGui/QPrintPreviewDialog> -#include <QtGui/QStackedWidget> - -#include <QtHelp/QHelpEngine> -#include <QtHelp/QHelpSearchEngine> +#include <QEvent> +#include <QTimer> + +#include <QKeyEvent> +#include <QLayout> +#include <QPageSetupDialog> +#include <QPrinter> +#include <QPrintDialog> +#include <QPrintPreviewDialog> +#include <QStackedWidget> + +#include <QHelpEngine> +#include <QHelpSearchEngine> using namespace Help::Internal; diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h index 165483a77e..444c87357d 100644 --- a/src/plugins/help/centralwidget.h +++ b/src/plugins/help/centralwidget.h @@ -35,7 +35,7 @@ #include <find/ifindsupport.h> -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QEvent) QT_FORWARD_DECLARE_CLASS(QAction) diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index c71424b4aa..ebebfdc457 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -35,11 +35,11 @@ #include <coreplugin/helpmanager.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> -#include <QtGui/QFileDialog> -#include <QtGui/QKeyEvent> -#include <QtGui/QMessageBox> +#include <QFileDialog> +#include <QKeyEvent> +#include <QMessageBox> using namespace Help::Internal; diff --git a/src/plugins/help/externalhelpwindow.cpp b/src/plugins/help/externalhelpwindow.cpp index 1bc1ced196..601f5386bd 100644 --- a/src/plugins/help/externalhelpwindow.cpp +++ b/src/plugins/help/externalhelpwindow.cpp @@ -39,11 +39,11 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> -#include <QtGui/QAction> -#include <QtGui/QHBoxLayout> -#include <QtGui/QKeyEvent> -#include <QtGui/QStatusBar> -#include <QtGui/QToolButton> +#include <QAction> +#include <QHBoxLayout> +#include <QKeyEvent> +#include <QStatusBar> +#include <QToolButton> using namespace Help::Internal; diff --git a/src/plugins/help/externalhelpwindow.h b/src/plugins/help/externalhelpwindow.h index a4bc5548ed..5d8ad0d3be 100644 --- a/src/plugins/help/externalhelpwindow.h +++ b/src/plugins/help/externalhelpwindow.h @@ -33,7 +33,7 @@ #ifndef EXTERNALHELPWINDOW #define EXTERNALHELPWINDOW -#include <QtGui/QMainWindow> +#include <QMainWindow> QT_FORWARD_DECLARE_CLASS(QCloseEvent) QT_FORWARD_DECLARE_CLASS(QToolButton) diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index 1452e0460b..b7c5211a5d 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -37,10 +37,10 @@ #include <coreplugin/helpmanager.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QFileDialog> +#include <QMessageBox> using namespace Help::Internal; diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index 925f15e797..4da766d099 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -45,15 +45,15 @@ #include <utils/fileutils.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> +#include <QCoreApplication> +#include <QSettings> +#include <QTextStream> -#include <QtGui/QApplication> -#include <QtGui/QFileDialog> +#include <QApplication> +#include <QFileDialog> #if !defined(QT_NO_WEBKIT) -#include <QtWebKit/QWebSettings> +#include <QWebSettings> #endif using namespace Help::Internal; diff --git a/src/plugins/help/help_global.h b/src/plugins/help/help_global.h index 102213995f..bbf4eb08b4 100644 --- a/src/plugins/help/help_global.h +++ b/src/plugins/help/help_global.h @@ -33,7 +33,7 @@ #ifndef HELP_GLOBAL_H #define HELP_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(HELP_LIBRARY) # define HELP_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h index 29a978e31a..47a7a07c1c 100644 --- a/src/plugins/help/helpconstants.h +++ b/src/plugins/help/helpconstants.h @@ -33,8 +33,8 @@ #ifndef HELPCONSTANTS_H #define HELPCONSTANTS_H -#include <QtCore/QtGlobal> -#include <QtCore/QLatin1String> +#include <QtGlobal> +#include <QLatin1String> namespace Help { namespace Constants { diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index 42cead49b2..b63ae1639b 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -39,7 +39,7 @@ #include <coreplugin/icore.h> #include <coreplugin/helpmanager.h> -#include <QtGui/QIcon> +#include <QIcon> using namespace Locator; using namespace Help; diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h index 809e3ca123..744d2d3bed 100644 --- a/src/plugins/help/helpindexfilter.h +++ b/src/plugins/help/helpindexfilter.h @@ -35,7 +35,7 @@ #include <locator/ilocatorfilter.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Help { namespace Internal { diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp index 060af4c5bf..6530ec83f6 100644 --- a/src/plugins/help/helpmode.cpp +++ b/src/plugins/help/helpmode.cpp @@ -33,7 +33,7 @@ #include "helpmode.h" #include "helpconstants.h" -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace Help; using namespace Help::Internal; diff --git a/src/plugins/help/helpmode.h b/src/plugins/help/helpmode.h index 994b18c629..e1557fe3bf 100644 --- a/src/plugins/help/helpmode.h +++ b/src/plugins/help/helpmode.h @@ -35,8 +35,8 @@ #include <coreplugin/imode.h> -#include <QtCore/QString> -#include <QtGui/QIcon> +#include <QString> +#include <QIcon> namespace Help { namespace Internal { diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index b54c73a7c9..3a502bcc34 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -71,29 +71,29 @@ #include <texteditor/texteditorconstants.h> #include <utils/styledbar.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QLibraryInfo> -#include <QtCore/QTimer> -#include <QtCore/QTranslator> -#include <QtCore/qplugin.h> -#include <QtCore/QRegExp> - -#include <QtGui/QAction> -#include <QtGui/QComboBox> -#include <QtGui/QDesktopServices> -#include <QtGui/QMenu> -#include <QtGui/QShortcut> -#include <QtGui/QStackedLayout> -#include <QtGui/QSplitter> - -#include <QtHelp/QHelpEngine> +#include <QDir> +#include <QFileInfo> +#include <QLibraryInfo> +#include <QTimer> +#include <QTranslator> +#include <qplugin.h> +#include <QRegExp> + +#include <QAction> +#include <QComboBox> +#include <QDesktopServices> +#include <QMenu> +#include <QShortcut> +#include <QStackedLayout> +#include <QSplitter> + +#include <QHelpEngine> #if !defined(QT_NO_WEBKIT) -#include <QtWebKit/QWebElement> -#include <QtWebKit/QWebElementCollection> -#include <QtWebKit/QWebFrame> -#include <QtWebKit/QWebHistory> +#include <QWebElement> +#include <QWebElementCollection> +#include <QWebFrame> +#include <QWebHistory> #endif using namespace Help::Internal; diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h index 9b7c271bfe..17c0138318 100644 --- a/src/plugins/help/helpplugin.h +++ b/src/plugins/help/helpplugin.h @@ -34,8 +34,8 @@ #define HELPPLUGIN_H #include <extensionsystem/iplugin.h> -#include <QtCore/QMap> -#include <QtCore/QStringList> +#include <QMap> +#include <QStringList> QT_FORWARD_DECLARE_CLASS(QAction) QT_FORWARD_DECLARE_CLASS(QComboBox) diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp index e3f0b9c1e4..74dd7ddd95 100644 --- a/src/plugins/help/helpviewer.cpp +++ b/src/plugins/help/helpviewer.cpp @@ -38,17 +38,17 @@ #include <utils/fileutils.h> -#include <QtCore/QFileInfo> -#include <QtCore/QStringBuilder> -#include <QtCore/QDir> -#include <QtCore/QUrl> +#include <QFileInfo> +#include <QStringBuilder> +#include <QDir> +#include <QUrl> -#include <QtGui/QApplication> -#include <QtGui/QDesktopServices> -#include <QtGui/QMainWindow> -#include <QtGui/QMouseEvent> +#include <QApplication> +#include <QDesktopServices> +#include <QMainWindow> +#include <QMouseEvent> -#include <QtHelp/QHelpEngine> +#include <QHelpEngine> using namespace Help::Internal; diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h index c2efebbce7..54a9eda171 100644 --- a/src/plugins/help/helpviewer.h +++ b/src/plugins/help/helpviewer.h @@ -35,18 +35,18 @@ #include <find/ifindsupport.h> -#include <QtCore/qglobal.h> -#include <QtCore/QString> -#include <QtCore/QUrl> -#include <QtCore/QVariant> +#include <qglobal.h> +#include <QString> +#include <QUrl> +#include <QVariant> -#include <QtGui/QAction> -#include <QtGui/QFont> +#include <QAction> +#include <QFont> #if defined(QT_NO_WEBKIT) -#include <QtGui/QTextBrowser> +#include <QTextBrowser> #else -#include <QtWebKit/QWebView> +#include <QWebView> #endif namespace Help { diff --git a/src/plugins/help/helpviewer_p.h b/src/plugins/help/helpviewer_p.h index e7e6a12c61..bfef154e3d 100644 --- a/src/plugins/help/helpviewer_p.h +++ b/src/plugins/help/helpviewer_p.h @@ -37,8 +37,8 @@ #include "helpviewer.h" #include "openpagesmanager.h" -#include <QtCore/QObject> -#include <QtGui/QTextBrowser> +#include <QObject> +#include <QTextBrowser> namespace Help { namespace Internal { diff --git a/src/plugins/help/helpviewer_qtb.cpp b/src/plugins/help/helpviewer_qtb.cpp index 8af35813e5..7420eb92b6 100644 --- a/src/plugins/help/helpviewer_qtb.cpp +++ b/src/plugins/help/helpviewer_qtb.cpp @@ -38,13 +38,13 @@ #include "helpviewer_p.h" #include "localhelpmanager.h" -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QApplication> +#include <QClipboard> +#include <QContextMenuEvent> +#include <QKeyEvent> +#include <QMenu> -#include <QtHelp/QHelpEngine> +#include <QHelpEngine> using namespace Find; using namespace Help; diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp index d121281a41..9f0d4cbf0e 100644 --- a/src/plugins/help/helpviewer_qwv.cpp +++ b/src/plugins/help/helpviewer_qwv.cpp @@ -39,18 +39,18 @@ #include "localhelpmanager.h" #include "openpagesmanager.h" -#include <QtCore/QFileInfo> -#include <QtCore/QString> -#include <QtCore/QStringBuilder> -#include <QtCore/QTimer> +#include <QFileInfo> +#include <QString> +#include <QStringBuilder> +#include <QTimer> -#include <QtGui/QApplication> -#include <QtGui/QWheelEvent> +#include <QApplication> +#include <QWheelEvent> -#include <QtHelp/QHelpEngine> +#include <QHelpEngine> -#include <QtNetwork/QNetworkReply> -#include <QtNetwork/QNetworkRequest> +#include <QNetworkReply> +#include <QNetworkRequest> #include <utils/networkaccessmanager.h> diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index 54c25d6268..2f722f1059 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -36,9 +36,9 @@ #include <app/app_version.h> #include <coreplugin/helpmanager.h> -#include <QtCore/QMutexLocker> +#include <QMutexLocker> -#include <QtHelp/QHelpEngine> +#include <QHelpEngine> using namespace Help::Internal; diff --git a/src/plugins/help/localhelpmanager.h b/src/plugins/help/localhelpmanager.h index 8881ed36c3..db7abfda71 100644 --- a/src/plugins/help/localhelpmanager.h +++ b/src/plugins/help/localhelpmanager.h @@ -33,8 +33,8 @@ #ifndef LOCALHELPMANAGER_H #define LOCALHELPMANAGER_H -#include <QtCore/QMutex> -#include <QtCore/QObject> +#include <QMutex> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QHelpEngine) diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp index 1ea30e4596..21faffea3f 100644 --- a/src/plugins/help/openpagesmanager.cpp +++ b/src/plugins/help/openpagesmanager.cpp @@ -40,13 +40,13 @@ #include "openpagesswitcher.h" #include "openpageswidget.h" -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QComboBox> -#include <QtGui/QMenu> -#include <QtGui/QTreeView> +#include <QApplication> +#include <QClipboard> +#include <QComboBox> +#include <QMenu> +#include <QTreeView> -#include <QtHelp/QHelpEngine> +#include <QHelpEngine> #include <coreplugin/coreconstants.h> #include <coreplugin/helpmanager.h> diff --git a/src/plugins/help/openpagesmanager.h b/src/plugins/help/openpagesmanager.h index 6018bc6b84..25bd87af9f 100644 --- a/src/plugins/help/openpagesmanager.h +++ b/src/plugins/help/openpagesmanager.h @@ -33,7 +33,7 @@ #ifndef OPENPAGESMANAGER_H #define OPENPAGESMANAGER_H -#include <QtCore/QObject> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QComboBox) QT_FORWARD_DECLARE_CLASS(QListView) diff --git a/src/plugins/help/openpagesmodel.cpp b/src/plugins/help/openpagesmodel.cpp index 869ec18523..669645278b 100644 --- a/src/plugins/help/openpagesmodel.cpp +++ b/src/plugins/help/openpagesmodel.cpp @@ -33,7 +33,7 @@ #include "openpagesmodel.h" #include "helpviewer.h" -#include <QtCore/QUrl> +#include <QUrl> using namespace Help::Internal; diff --git a/src/plugins/help/openpagesmodel.h b/src/plugins/help/openpagesmodel.h index 1e38772569..321cf631d8 100644 --- a/src/plugins/help/openpagesmodel.h +++ b/src/plugins/help/openpagesmodel.h @@ -33,8 +33,8 @@ #ifndef OPENPAGESMODEL_H #define OPENPAGESMODEL_H -#include <QtCore/QList> -#include <QtCore/QAbstractTableModel> +#include <QList> +#include <QAbstractTableModel> QT_FORWARD_DECLARE_CLASS(QUrl) diff --git a/src/plugins/help/openpagesswitcher.cpp b/src/plugins/help/openpagesswitcher.cpp index 39ee7d0719..7e4126d3d4 100644 --- a/src/plugins/help/openpagesswitcher.cpp +++ b/src/plugins/help/openpagesswitcher.cpp @@ -36,10 +36,10 @@ #include "openpagesmodel.h" #include "openpageswidget.h" -#include <QtCore/QEvent> +#include <QEvent> -#include <QtGui/QKeyEvent> -#include <QtGui/QVBoxLayout> +#include <QKeyEvent> +#include <QVBoxLayout> using namespace Help::Internal; diff --git a/src/plugins/help/openpagesswitcher.h b/src/plugins/help/openpagesswitcher.h index 02913adb1c..3f47c17207 100644 --- a/src/plugins/help/openpagesswitcher.h +++ b/src/plugins/help/openpagesswitcher.h @@ -33,7 +33,7 @@ #ifndef OPENPAGESSWITCHER_H #define OPENPAGESSWITCHER_H -#include <QtGui/QFrame> +#include <QFrame> QT_FORWARD_DECLARE_CLASS(QModelIndex) diff --git a/src/plugins/help/openpageswidget.cpp b/src/plugins/help/openpageswidget.cpp index 88ee1002ab..f2f00651a4 100644 --- a/src/plugins/help/openpageswidget.cpp +++ b/src/plugins/help/openpageswidget.cpp @@ -37,13 +37,13 @@ #include <coreplugin/coreconstants.h> -#include <QtGui/QApplication> -#include <QtGui/QPainter> +#include <QApplication> +#include <QPainter> -#include <QtGui/QHeaderView> -#include <QtGui/QKeyEvent> -#include <QtGui/QMouseEvent> -#include <QtGui/QMenu> +#include <QHeaderView> +#include <QKeyEvent> +#include <QMouseEvent> +#include <QMenu> #ifdef Q_OS_MAC #include <qmacstyle_mac.h> diff --git a/src/plugins/help/openpageswidget.h b/src/plugins/help/openpageswidget.h index 25cf15445f..1317f978c1 100644 --- a/src/plugins/help/openpageswidget.h +++ b/src/plugins/help/openpageswidget.h @@ -33,8 +33,8 @@ #ifndef OPENPAGESWIDGET_H #define OPENPAGESWIDGET_H -#include <QtGui/QStyledItemDelegate> -#include <QtGui/QTreeView> +#include <QStyledItemDelegate> +#include <QTreeView> namespace Help { namespace Internal { diff --git a/src/plugins/help/remotehelpfilter.cpp b/src/plugins/help/remotehelpfilter.cpp index e7e60b149c..173f967845 100644 --- a/src/plugins/help/remotehelpfilter.cpp +++ b/src/plugins/help/remotehelpfilter.cpp @@ -32,7 +32,7 @@ #include "remotehelpfilter.h" -#include <QtCore/QUrl> +#include <QUrl> namespace Help { namespace Internal { diff --git a/src/plugins/help/remotehelpfilter.h b/src/plugins/help/remotehelpfilter.h index 9db01711a2..9922136777 100644 --- a/src/plugins/help/remotehelpfilter.h +++ b/src/plugins/help/remotehelpfilter.h @@ -37,7 +37,7 @@ #include <locator/ilocatorfilter.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Help { namespace Internal { diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index daf7d49816..07b11cf2aa 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -38,21 +38,21 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <utils/styledbar.h> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> - -#include <QtGui/QMenu> -#include <QtGui/QLayout> -#include <QtGui/QKeyEvent> -#include <QtGui/QClipboard> -#include <QtGui/QApplication> -#include <QtGui/QTextBrowser> - -#include <QtHelp/QHelpEngine> -#include <QtHelp/QHelpSearchEngine> -#include <QtHelp/QHelpSearchQueryWidget> -#include <QtHelp/QHelpSearchResultWidget> +#include <QMap> +#include <QString> +#include <QStringList> + +#include <QMenu> +#include <QLayout> +#include <QKeyEvent> +#include <QClipboard> +#include <QApplication> +#include <QTextBrowser> + +#include <QHelpEngine> +#include <QHelpSearchEngine> +#include <QHelpSearchQueryWidget> +#include <QHelpSearchResultWidget> using namespace Help::Internal; diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h index aa867b8b86..3c9057888e 100644 --- a/src/plugins/help/searchwidget.h +++ b/src/plugins/help/searchwidget.h @@ -33,10 +33,10 @@ #ifndef SEARCHWIDGET_H #define SEARCHWIDGET_H -#include <QtCore/QFutureInterface> -#include <QtCore/QFutureWatcher> +#include <QFutureInterface> +#include <QFutureWatcher> -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QHelpSearchEngine) QT_FORWARD_DECLARE_CLASS(QHelpSearchResultWidget) diff --git a/src/plugins/help/xbelsupport.cpp b/src/plugins/help/xbelsupport.cpp index 91d3e08900..3c50510eba 100644 --- a/src/plugins/help/xbelsupport.cpp +++ b/src/plugins/help/xbelsupport.cpp @@ -33,7 +33,7 @@ #include "xbelsupport.h" #include "bookmarkmanager.h" -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace Help::Internal; diff --git a/src/plugins/help/xbelsupport.h b/src/plugins/help/xbelsupport.h index 2b887dc241..a06eb58a21 100644 --- a/src/plugins/help/xbelsupport.h +++ b/src/plugins/help/xbelsupport.h @@ -33,8 +33,8 @@ #ifndef XBELSUPPORT_H #define XBELSUPPORT_H -#include <QtGui/QIcon> -#include <QtCore/QXmlStreamReader> +#include <QIcon> +#include <QXmlStreamReader> QT_FORWARD_DECLARE_CLASS(QIODevice) QT_FORWARD_DECLARE_CLASS(QStandardItem) diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp index 36aa1654b9..342324921c 100644 --- a/src/plugins/imageviewer/imageview.cpp +++ b/src/plugins/imageviewer/imageview.cpp @@ -42,15 +42,15 @@ #include "imageview.h" -#include <QtCore/QFile> -#include <QtGui/QWheelEvent> -#include <QtGui/QMouseEvent> -#include <QtGui/QGraphicsRectItem> -#include <QtGui/QPixmap> +#include <QFile> +#include <QWheelEvent> +#include <QMouseEvent> +#include <QGraphicsRectItem> +#include <QPixmap> #ifndef QT_NO_SVG -#include <QtSvg/QGraphicsSvgItem> +#include <QGraphicsSvgItem> #endif -#include <QtGui/QImageReader> +#include <QImageReader> #include <qmath.h> diff --git a/src/plugins/imageviewer/imageview.h b/src/plugins/imageviewer/imageview.h index 2d3c4018ff..7ccad82f1c 100644 --- a/src/plugins/imageviewer/imageview.h +++ b/src/plugins/imageviewer/imageview.h @@ -43,8 +43,8 @@ #ifndef IMAGEVIEW_H #define IMAGEVIEW_H -#include <QtGui/QGraphicsView> -#include <QtCore/QScopedPointer> +#include <QGraphicsView> +#include <QScopedPointer> namespace ImageViewer { namespace Internal { diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index ac32f1e3db..56ef88d9b7 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -43,11 +43,11 @@ #include <coreplugin/actionmanager/command.h> #include <utils/qtcassert.h> -#include <QtCore/QMap> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QWidget> -#include <QtCore/QtDebug> +#include <QMap> +#include <QFileInfo> +#include <QDir> +#include <QWidget> +#include <QtDebug> namespace ImageViewer { namespace Internal { diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h index 49fd05b96a..a79d4a967b 100644 --- a/src/plugins/imageviewer/imageviewer.h +++ b/src/plugins/imageviewer/imageviewer.h @@ -37,8 +37,8 @@ #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/ifile.h> -#include <QtCore/QScopedPointer> -#include <QtCore/QStringList> +#include <QScopedPointer> +#include <QStringList> QT_BEGIN_NAMESPACE class QAbstractButton; diff --git a/src/plugins/imageviewer/imagevieweractionhandler.cpp b/src/plugins/imageviewer/imagevieweractionhandler.cpp index db2416bc2a..18fe4a9d4a 100644 --- a/src/plugins/imageviewer/imagevieweractionhandler.cpp +++ b/src/plugins/imageviewer/imagevieweractionhandler.cpp @@ -35,9 +35,9 @@ #include "imageviewer.h" #include "imageviewerconstants.h" -#include <QtCore/QList> -#include <QtCore/QSignalMapper> -#include <QtGui/QAction> +#include <QList> +#include <QSignalMapper> +#include <QAction> #include <coreplugin/icore.h> #include <coreplugin/actionmanager/actionmanager.h> diff --git a/src/plugins/imageviewer/imagevieweractionhandler.h b/src/plugins/imageviewer/imagevieweractionhandler.h index a1cca739c0..7c340e5fe7 100644 --- a/src/plugins/imageviewer/imagevieweractionhandler.h +++ b/src/plugins/imageviewer/imagevieweractionhandler.h @@ -36,7 +36,7 @@ #include "coreplugin/id.h" -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QKeySequence; diff --git a/src/plugins/imageviewer/imageviewerfactory.cpp b/src/plugins/imageviewer/imageviewerfactory.cpp index f9b54c7203..5b423c33f9 100644 --- a/src/plugins/imageviewer/imageviewerfactory.cpp +++ b/src/plugins/imageviewer/imageviewerfactory.cpp @@ -36,9 +36,9 @@ #include "imageviewerconstants.h" #include "imageviewer.h" -#include <QtCore/QMap> -#include <QtGui/QImageReader> -#include <QtCore/QtDebug> +#include <QMap> +#include <QImageReader> +#include <QtDebug> namespace ImageViewer { namespace Internal { diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index 03cbc2e3f8..88e7c58ccc 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -39,9 +39,9 @@ #include <utils/reloadpromptutils.h> -#include <QtCore/QMap> -#include <QtCore/QFileInfo> -#include <QtCore/QtDebug> +#include <QMap> +#include <QFileInfo> +#include <QtDebug> namespace ImageViewer { namespace Internal { diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index 631e2bec86..fb7eaa124e 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -36,7 +36,7 @@ #include <coreplugin/ifile.h> -#include <QtCore/QScopedPointer> +#include <QScopedPointer> namespace ImageViewer { namespace Internal { diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp index a947d4708c..f86409e1d6 100644 --- a/src/plugins/imageviewer/imageviewerplugin.cpp +++ b/src/plugins/imageviewer/imageviewerplugin.cpp @@ -35,7 +35,7 @@ #include "imageviewerfactory.h" #include "imageviewerconstants.h" -#include <QtCore/QDebug> +#include <QDebug> #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> diff --git a/src/plugins/imageviewer/imageviewerplugin.h b/src/plugins/imageviewer/imageviewerplugin.h index 16b29e6025..66aba08157 100644 --- a/src/plugins/imageviewer/imageviewerplugin.h +++ b/src/plugins/imageviewer/imageviewerplugin.h @@ -36,7 +36,7 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> namespace ImageViewer { diff --git a/src/plugins/locator/basefilefilter.cpp b/src/plugins/locator/basefilefilter.cpp index 9219a322cf..dc220f4f30 100644 --- a/src/plugins/locator/basefilefilter.cpp +++ b/src/plugins/locator/basefilefilter.cpp @@ -34,8 +34,8 @@ #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QDir> -#include <QtCore/QStringMatcher> +#include <QDir> +#include <QStringMatcher> using namespace Core; using namespace Locator; diff --git a/src/plugins/locator/basefilefilter.h b/src/plugins/locator/basefilefilter.h index ef7f2e2ba0..72a6b5e9d1 100644 --- a/src/plugins/locator/basefilefilter.h +++ b/src/plugins/locator/basefilefilter.h @@ -36,7 +36,7 @@ #include "locator_global.h" #include "ilocatorfilter.h" -#include <QtCore/QStringList> +#include <QStringList> namespace Locator { diff --git a/src/plugins/locator/commandlocator.cpp b/src/plugins/locator/commandlocator.cpp index ca075d6e2d..0731ca1bb9 100644 --- a/src/plugins/locator/commandlocator.cpp +++ b/src/plugins/locator/commandlocator.cpp @@ -37,7 +37,7 @@ #include <utils/qtcassert.h> -#include <QtGui/QAction> +#include <QAction> namespace Locator { diff --git a/src/plugins/locator/commandlocator.h b/src/plugins/locator/commandlocator.h index 8ef27f2075..857af6f0b5 100644 --- a/src/plugins/locator/commandlocator.h +++ b/src/plugins/locator/commandlocator.h @@ -35,7 +35,7 @@ #include "locator_global.h" #include "ilocatorfilter.h" -#include <QtCore/QList> +#include <QList> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/locator/directoryfilter.cpp b/src/plugins/locator/directoryfilter.cpp index aab9d439e2..a6fd24027c 100644 --- a/src/plugins/locator/directoryfilter.cpp +++ b/src/plugins/locator/directoryfilter.cpp @@ -32,11 +32,11 @@ #include "directoryfilter.h" -#include <QtCore/QDir> -#include <QtCore/QStack> -#include <QtGui/QCompleter> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDir> +#include <QStack> +#include <QCompleter> +#include <QFileDialog> +#include <QMessageBox> #include <utils/QtConcurrentTools> #include <utils/filesearch.h> diff --git a/src/plugins/locator/directoryfilter.h b/src/plugins/locator/directoryfilter.h index 65714b52e1..6b33689baa 100644 --- a/src/plugins/locator/directoryfilter.h +++ b/src/plugins/locator/directoryfilter.h @@ -36,11 +36,11 @@ #include "ui_directoryfilter.h" #include "basefilefilter.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QByteArray> -#include <QtCore/QFutureInterface> -#include <QtCore/QMutex> +#include <QString> +#include <QList> +#include <QByteArray> +#include <QFutureInterface> +#include <QMutex> namespace Locator { namespace Internal { diff --git a/src/plugins/locator/executefilter.cpp b/src/plugins/locator/executefilter.cpp index 83f6ee6c89..2a33573b82 100644 --- a/src/plugins/locator/executefilter.cpp +++ b/src/plugins/locator/executefilter.cpp @@ -36,7 +36,7 @@ #include <coreplugin/messagemanager.h> #include <coreplugin/variablemanager.h> -#include <QtGui/QMessageBox> +#include <QMessageBox> using namespace Core; using namespace Locator; diff --git a/src/plugins/locator/executefilter.h b/src/plugins/locator/executefilter.h index bd5a503f74..3ca7735273 100644 --- a/src/plugins/locator/executefilter.h +++ b/src/plugins/locator/executefilter.h @@ -37,9 +37,9 @@ #include <utils/qtcprocess.h> -#include <QtCore/QQueue> -#include <QtCore/QStringList> -#include <QtCore/QTimer> +#include <QQueue> +#include <QStringList> +#include <QTimer> namespace Locator { namespace Internal { diff --git a/src/plugins/locator/filesystemfilter.cpp b/src/plugins/locator/filesystemfilter.cpp index cec8bf8807..dbc8962052 100644 --- a/src/plugins/locator/filesystemfilter.cpp +++ b/src/plugins/locator/filesystemfilter.cpp @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QDir> +#include <QDir> using namespace Core; using namespace Locator; diff --git a/src/plugins/locator/filesystemfilter.h b/src/plugins/locator/filesystemfilter.h index 090274c1f6..a65a0e2e08 100644 --- a/src/plugins/locator/filesystemfilter.h +++ b/src/plugins/locator/filesystemfilter.h @@ -36,10 +36,10 @@ #include "ilocatorfilter.h" #include "ui_filesystemfilter.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QByteArray> -#include <QtCore/QFutureInterface> +#include <QString> +#include <QList> +#include <QByteArray> +#include <QFutureInterface> namespace Core { class EditorManager; diff --git a/src/plugins/locator/ilocatorfilter.cpp b/src/plugins/locator/ilocatorfilter.cpp index 9cf66e2e81..7d44482a55 100644 --- a/src/plugins/locator/ilocatorfilter.cpp +++ b/src/plugins/locator/ilocatorfilter.cpp @@ -32,12 +32,12 @@ #include "ilocatorfilter.h" -#include <QtGui/QBoxLayout> -#include <QtGui/QCheckBox> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> +#include <QBoxLayout> +#include <QCheckBox> +#include <QDialog> +#include <QDialogButtonBox> +#include <QLabel> +#include <QLineEdit> using namespace Locator; diff --git a/src/plugins/locator/ilocatorfilter.h b/src/plugins/locator/ilocatorfilter.h index 0d598be92f..82a1cde49c 100644 --- a/src/plugins/locator/ilocatorfilter.h +++ b/src/plugins/locator/ilocatorfilter.h @@ -35,9 +35,9 @@ #include "locator_global.h" -#include <QtCore/QVariant> -#include <QtCore/QFutureInterface> -#include <QtGui/QIcon> +#include <QVariant> +#include <QFutureInterface> +#include <QIcon> namespace Locator { diff --git a/src/plugins/locator/locator_global.h b/src/plugins/locator/locator_global.h index f128a106f6..99f8a1e873 100644 --- a/src/plugins/locator/locator_global.h +++ b/src/plugins/locator/locator_global.h @@ -33,7 +33,7 @@ #ifndef LOCATOR_GLOBAL_H #define LOCATOR_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(LOCATOR_LIBRARY) # define LOCATOR_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/locator/locatorconstants.h b/src/plugins/locator/locatorconstants.h index ca765cfdc2..400cf4f296 100644 --- a/src/plugins/locator/locatorconstants.h +++ b/src/plugins/locator/locatorconstants.h @@ -33,7 +33,7 @@ #ifndef LOCATORCONSTANTS_H #define LOCATORCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Locator { namespace Constants { diff --git a/src/plugins/locator/locatorfiltersfilter.h b/src/plugins/locator/locatorfiltersfilter.h index 47ae8f2040..28da9d0e86 100644 --- a/src/plugins/locator/locatorfiltersfilter.h +++ b/src/plugins/locator/locatorfiltersfilter.h @@ -35,7 +35,7 @@ #include "ilocatorfilter.h" -#include <QtGui/QIcon> +#include <QIcon> namespace Locator { namespace Internal { diff --git a/src/plugins/locator/locatormanager.h b/src/plugins/locator/locatormanager.h index 4410fe0304..19e685eb2d 100644 --- a/src/plugins/locator/locatormanager.h +++ b/src/plugins/locator/locatormanager.h @@ -35,7 +35,7 @@ #include "locator_global.h" -#include <QtCore/QObject> +#include <QObject> namespace Locator { diff --git a/src/plugins/locator/locatorplugin.cpp b/src/plugins/locator/locatorplugin.cpp index 9a0fc297a0..19e88423d0 100644 --- a/src/plugins/locator/locatorplugin.cpp +++ b/src/plugins/locator/locatorplugin.cpp @@ -52,11 +52,11 @@ #include <utils/QtConcurrentTools> #include <utils/qtcassert.h> -#include <QtCore/QSettings> -#include <QtCore/QtPlugin> -#include <QtCore/QFuture> -#include <QtCore/QFutureWatcher> -#include <QtGui/QAction> +#include <QSettings> +#include <QtPlugin> +#include <QFuture> +#include <QFutureWatcher> +#include <QAction> /*! \namespace Locator diff --git a/src/plugins/locator/locatorplugin.h b/src/plugins/locator/locatorplugin.h index 7a918116b5..8c5a56a9e7 100644 --- a/src/plugins/locator/locatorplugin.h +++ b/src/plugins/locator/locatorplugin.h @@ -40,9 +40,9 @@ #include <extensionsystem/iplugin.h> #include <coreplugin/actionmanager/command.h> -#include <QtCore/QObject> -#include <QtCore/QTimer> -#include <QtCore/QFutureWatcher> +#include <QObject> +#include <QTimer> +#include <QFutureWatcher> namespace Locator { namespace Internal { diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp index 9289066d87..f7ba5f8a12 100644 --- a/src/plugins/locator/locatorwidget.cpp +++ b/src/plugins/locator/locatorwidget.cpp @@ -49,26 +49,26 @@ #include <utils/qtcassert.h> #include <utils/runextensions.h> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtCore/QTimer> -#include <QtCore/QSettings> -#include <QtCore/QEvent> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> -#include <QtGui/QKeyEvent> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMenu> -#include <QtGui/QMouseEvent> -#include <QtGui/QPushButton> -#include <QtGui/QScrollBar> -#include <QtGui/QTreeView> -#include <QtGui/QToolTip> +#include <QtConcurrentRun> +#include <QFileInfo> +#include <QFile> +#include <QTimer> +#include <QSettings> +#include <QEvent> +#include <QAction> +#include <QApplication> +#include <QContextMenuEvent> +#include <QHBoxLayout> +#include <QHeaderView> +#include <QKeyEvent> +#include <QLabel> +#include <QLineEdit> +#include <QMenu> +#include <QMouseEvent> +#include <QPushButton> +#include <QScrollBar> +#include <QTreeView> +#include <QToolTip> Q_DECLARE_METATYPE(Locator::ILocatorFilter*) Q_DECLARE_METATYPE(Locator::FilterEntry) diff --git a/src/plugins/locator/locatorwidget.h b/src/plugins/locator/locatorwidget.h index 755242a19e..2eb3cdc8f9 100644 --- a/src/plugins/locator/locatorwidget.h +++ b/src/plugins/locator/locatorwidget.h @@ -35,7 +35,7 @@ #include "locatorplugin.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/locator/opendocumentsfilter.cpp b/src/plugins/locator/opendocumentsfilter.cpp index e6e594e5ee..c9ca9e084f 100644 --- a/src/plugins/locator/opendocumentsfilter.cpp +++ b/src/plugins/locator/opendocumentsfilter.cpp @@ -35,8 +35,8 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> +#include <QFileInfo> +#include <QDir> using namespace Core; using namespace Locator; diff --git a/src/plugins/locator/opendocumentsfilter.h b/src/plugins/locator/opendocumentsfilter.h index 2acda23865..2cf9f2814a 100644 --- a/src/plugins/locator/opendocumentsfilter.h +++ b/src/plugins/locator/opendocumentsfilter.h @@ -37,10 +37,10 @@ #include <coreplugin/editormanager/openeditorsmodel.h> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QByteArray> -#include <QtCore/QFutureInterface> +#include <QString> +#include <QList> +#include <QByteArray> +#include <QFutureInterface> namespace Core { class EditorManager; diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp index 48ce67f9c2..1b32faccde 100644 --- a/src/plugins/locator/settingspage.cpp +++ b/src/plugins/locator/settingspage.cpp @@ -41,7 +41,7 @@ #include <utils/QtConcurrentTools> #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> Q_DECLARE_METATYPE(Locator::ILocatorFilter*) diff --git a/src/plugins/locator/settingspage.h b/src/plugins/locator/settingspage.h index 9a92f7e3a4..7ce01a2a9f 100644 --- a/src/plugins/locator/settingspage.h +++ b/src/plugins/locator/settingspage.h @@ -35,8 +35,8 @@ #include "ui_settingspage.h" -#include <QtCore/QPointer> -#include <QtCore/QHash> +#include <QPointer> +#include <QHash> #include <coreplugin/dialogs/ioptionspage.h> diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp index 3a009adbf1..61f39fd9b0 100644 --- a/src/plugins/macros/actionmacrohandler.cpp +++ b/src/plugins/macros/actionmacrohandler.cpp @@ -43,14 +43,14 @@ #include <coreplugin/id.h> #include <coreplugin/icontext.h> -#include <QtCore/QObject> -#include <QtCore/QEvent> -#include <QtCore/QSignalMapper> -#include <QtCore/QtAlgorithms> -#include <QtCore/QStringList> - -#include <QtGui/QAction> -#include <QtGui/QShortcut> +#include <QObject> +#include <QEvent> +#include <QSignalMapper> +#include <QtAlgorithms> +#include <QStringList> + +#include <QAction> +#include <QShortcut> using namespace Macros; using namespace Macros::Internal; diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h index f986c24a62..37105cd1ae 100644 --- a/src/plugins/macros/actionmacrohandler.h +++ b/src/plugins/macros/actionmacrohandler.h @@ -35,7 +35,7 @@ #include "imacrohandler.h" -#include <QtCore/QSet> +#include <QSet> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/macros/imacrohandler.h b/src/plugins/macros/imacrohandler.h index a691eb5731..bf96475cce 100644 --- a/src/plugins/macros/imacrohandler.h +++ b/src/plugins/macros/imacrohandler.h @@ -34,7 +34,7 @@ #define MACROSPLUGIN_IMACROHANDLER_H #include "macros_global.h" -#include <QtCore/QObject> +#include <QObject> namespace Macros { diff --git a/src/plugins/macros/macro.cpp b/src/plugins/macros/macro.cpp index 2149834dfb..bf11ec84da 100644 --- a/src/plugins/macros/macro.cpp +++ b/src/plugins/macros/macro.cpp @@ -36,8 +36,8 @@ #include <app/app_version.h> #include <utils/fileutils.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDataStream> +#include <QFileInfo> +#include <QDataStream> using namespace Macros; diff --git a/src/plugins/macros/macro.h b/src/plugins/macros/macro.h index 9594ac4c98..4845d20662 100644 --- a/src/plugins/macros/macro.h +++ b/src/plugins/macros/macro.h @@ -35,8 +35,8 @@ #include "macros_global.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/macros/macroevent.cpp b/src/plugins/macros/macroevent.cpp index 8d46cb202d..e0d313bc6a 100644 --- a/src/plugins/macros/macroevent.cpp +++ b/src/plugins/macros/macroevent.cpp @@ -32,9 +32,9 @@ #include "macroevent.h" -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtCore/QDataStream> +#include <QString> +#include <QVariant> +#include <QDataStream> using namespace Macros; diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h index aa9c2dee75..0fef938004 100644 --- a/src/plugins/macros/macroevent.h +++ b/src/plugins/macros/macroevent.h @@ -35,7 +35,7 @@ #include "macros_global.h" -#include <QtCore/QMap> +#include <QMap> QT_BEGIN_NAMESPACE class QByteArray; diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp index 43613cd528..a29933bd32 100644 --- a/src/plugins/macros/macrolocatorfilter.cpp +++ b/src/plugins/macros/macrolocatorfilter.cpp @@ -38,7 +38,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtGui/QPixmap> +#include <QPixmap> using namespace Macros; using namespace Macros::Internal; diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h index e4182ca030..875bf44faf 100644 --- a/src/plugins/macros/macrolocatorfilter.h +++ b/src/plugins/macros/macrolocatorfilter.h @@ -35,7 +35,7 @@ #include <locator/ilocatorfilter.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Macros { diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 0951f08599..7c1293c488 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -53,18 +53,18 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QSignalMapper> -#include <QtCore/QList> - -#include <QtGui/QShortcut> -#include <QtGui/QMainWindow> -#include <QtGui/QAction> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QSettings> +#include <QSignalMapper> +#include <QList> + +#include <QShortcut> +#include <QMainWindow> +#include <QAction> +#include <QFileDialog> +#include <QMessageBox> using namespace Macros; using namespace Macros::Internal; diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h index 133d67cb02..c3b48ae3b1 100644 --- a/src/plugins/macros/macromanager.h +++ b/src/plugins/macros/macromanager.h @@ -35,8 +35,8 @@ #include "macros_global.h" -#include <QtCore/QObject> -#include <QtCore/QMap> +#include <QObject> +#include <QMap> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/macros/macrooptionspage.cpp b/src/plugins/macros/macrooptionspage.cpp index a94e436528..ed3ccaff0d 100644 --- a/src/plugins/macros/macrooptionspage.cpp +++ b/src/plugins/macros/macrooptionspage.cpp @@ -38,9 +38,9 @@ #include <texteditor/texteditorconstants.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QWidget> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QWidget> +#include <QIcon> using namespace Macros; using namespace Macros::Internal; diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 7154071b90..8fb6d3e286 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -43,18 +43,18 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/id.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> - -#include <QtGui/QShortcut> -#include <QtGui/QButtonGroup> -#include <QtGui/QTreeWidget> -#include <QtGui/QTreeWidgetItem> -#include <QtGui/QCheckBox> -#include <QtGui/QGroupBox> -#include <QtGui/QHeaderView> -#include <QtGui/QRegExpValidator> -#include <QtGui/QLineEdit> +#include <QDir> +#include <QFileInfo> + +#include <QShortcut> +#include <QButtonGroup> +#include <QTreeWidget> +#include <QTreeWidgetItem> +#include <QCheckBox> +#include <QGroupBox> +#include <QHeaderView> +#include <QRegExpValidator> +#include <QLineEdit> namespace { int NAME_ROLE = Qt::UserRole; diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h index 090b06a717..18d3c8d040 100644 --- a/src/plugins/macros/macrooptionswidget.h +++ b/src/plugins/macros/macrooptionswidget.h @@ -33,10 +33,10 @@ #ifndef MACROSPLUGIN_MACROOPTIONSWIDGET_H #define MACROSPLUGIN_MACROOPTIONSWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> -#include <QtCore/QStringList> -#include <QtCore/QMap> +#include <QStringList> +#include <QMap> QT_BEGIN_NAMESPACE class QTreeWidgetItem; diff --git a/src/plugins/macros/macros_global.h b/src/plugins/macros/macros_global.h index 8a23cdff65..466569df7f 100644 --- a/src/plugins/macros/macros_global.h +++ b/src/plugins/macros/macros_global.h @@ -33,7 +33,7 @@ #ifndef MACROSPLUGIN_MACROS_GLOBAL_H #define MACROSPLUGIN_MACROS_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(MACROS_LIBRARY) # define MACROS_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp index b8dcfd850a..3fd60310eb 100644 --- a/src/plugins/macros/macrosplugin.cpp +++ b/src/plugins/macros/macrosplugin.cpp @@ -47,11 +47,11 @@ #include <coreplugin/id.h> #include <coreplugin/icontext.h> -#include <QtCore/QtPlugin> -#include <QtCore/QSettings> -#include <QtGui/QAction> -#include <QtGui/QKeySequence> -#include <QtGui/QMenu> +#include <QtPlugin> +#include <QSettings> +#include <QAction> +#include <QKeySequence> +#include <QMenu> using namespace Macros; using namespace Macros::Internal; diff --git a/src/plugins/macros/macrotextfind.h b/src/plugins/macros/macrotextfind.h index cac39a421c..cdcc2c0e79 100644 --- a/src/plugins/macros/macrotextfind.h +++ b/src/plugins/macros/macrotextfind.h @@ -35,7 +35,7 @@ #include <find/ifindsupport.h> -#include <QtCore/QPointer> +#include <QPointer> namespace Macros { namespace Internal { diff --git a/src/plugins/macros/savedialog.cpp b/src/plugins/macros/savedialog.cpp index 8a75ec0618..1bc8459650 100644 --- a/src/plugins/macros/savedialog.cpp +++ b/src/plugins/macros/savedialog.cpp @@ -33,9 +33,9 @@ #include "savedialog.h" #include "ui_savedialog.h" -#include <QtGui/QLineEdit> -#include <QtGui/QCheckBox> -#include <QtGui/QRegExpValidator> +#include <QLineEdit> +#include <QCheckBox> +#include <QRegExpValidator> using namespace Macros::Internal; diff --git a/src/plugins/macros/savedialog.h b/src/plugins/macros/savedialog.h index af49298061..4e0800ab5d 100644 --- a/src/plugins/macros/savedialog.h +++ b/src/plugins/macros/savedialog.h @@ -33,7 +33,7 @@ #ifndef MACROSPLUGIN_SAVEDIALOG_H #define MACROSPLUGIN_SAVEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace Macros { namespace Internal { diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index 11d58f3e80..74327b090e 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -44,10 +44,10 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/id.h> -#include <QtGui/QWidget> -#include <QtGui/QKeyEvent> -#include <QtGui/QApplication> -#include <QtGui/QShortcut> +#include <QWidget> +#include <QKeyEvent> +#include <QApplication> +#include <QShortcut> using namespace Macros; using namespace Macros::Internal; diff --git a/src/plugins/madde/madde.pro b/src/plugins/madde/madde.pro index 2ff8bf148e..04b79afce3 100644 --- a/src/plugins/madde/madde.pro +++ b/src/plugins/madde/madde.pro @@ -1,5 +1,6 @@ TEMPLATE = lib TARGET = Madde +QT += network include(../../qtcreatorplugin.pri) include(madde_dependencies.pri) diff --git a/src/plugins/madde/madde_exports.h b/src/plugins/madde/madde_exports.h index c15e4f321f..a7da2c206d 100644 --- a/src/plugins/madde/madde_exports.h +++ b/src/plugins/madde/madde_exports.h @@ -33,7 +33,7 @@ #ifndef MADDEEXPORT_H #define MADDEEXPORT_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(MADDE_LIBRARY) # define MADDE_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/madde/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp index e2c6438433..77ce8a59fc 100644 --- a/src/plugins/madde/maddedevicetester.cpp +++ b/src/plugins/madde/maddedevicetester.cpp @@ -38,7 +38,7 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QRegExp> +#include <QRegExp> using namespace RemoteLinux; using namespace Utils; diff --git a/src/plugins/madde/maddedevicetester.h b/src/plugins/madde/maddedevicetester.h index 44570ca6dc..2dc176ae36 100644 --- a/src/plugins/madde/maddedevicetester.h +++ b/src/plugins/madde/maddedevicetester.h @@ -34,7 +34,7 @@ #include <remotelinux/linuxdevicetester.h> -#include <QtCore/QByteArray> +#include <QByteArray> namespace Utils { class SshRemoteProcessRunner; diff --git a/src/plugins/madde/maddeplugin.cpp b/src/plugins/madde/maddeplugin.cpp index 62e0093149..6e5713486e 100644 --- a/src/plugins/madde/maddeplugin.cpp +++ b/src/plugins/madde/maddeplugin.cpp @@ -45,7 +45,7 @@ #include "maemoqtversionfactory.h" #include "qt4maemotargetfactory.h" -#include <QtCore/QtPlugin> +#include <QtPlugin> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemoconstants.h b/src/plugins/madde/maemoconstants.h index 5efaec8d7b..111dabfb3b 100644 --- a/src/plugins/madde/maemoconstants.h +++ b/src/plugins/madde/maemoconstants.h @@ -32,7 +32,7 @@ #ifndef MAEMOCONSTANTS_H #define MAEMOCONSTANTS_H -#include <QtCore/QLatin1String> +#include <QLatin1String> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp index 8dfdd686e4..bbf2bfdb44 100644 --- a/src/plugins/madde/maemodeploybymountsteps.cpp +++ b/src/plugins/madde/maemodeploybymountsteps.cpp @@ -50,8 +50,8 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QFileInfo> -#include <QtCore/QList> +#include <QFileInfo> +#include <QList> using namespace ProjectExplorer; using namespace RemoteLinux; diff --git a/src/plugins/madde/maemodeployconfigurationwidget.cpp b/src/plugins/madde/maemodeployconfigurationwidget.cpp index c9eaf0c0e2..e4d8ae5cbe 100644 --- a/src/plugins/madde/maemodeployconfigurationwidget.cpp +++ b/src/plugins/madde/maemodeployconfigurationwidget.cpp @@ -45,11 +45,11 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QPixmap> -#include <QtGui/QVBoxLayout> +#include <QFileInfo> +#include <QFileDialog> +#include <QMessageBox> +#include <QPixmap> +#include <QVBoxLayout> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/madde/maemodeploymentmounter.h b/src/plugins/madde/maemodeploymentmounter.h index 1038e2bca3..a35e6d43f0 100644 --- a/src/plugins/madde/maemodeploymentmounter.h +++ b/src/plugins/madde/maemodeploymentmounter.h @@ -37,9 +37,9 @@ #include <remotelinux/portlist.h> -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QList> +#include <QObject> +#include <QSharedPointer> namespace Utils { class SshConnection; } namespace Qt4ProjectManager { class Qt4BuildConfiguration; } diff --git a/src/plugins/madde/maemodeploystepfactory.cpp b/src/plugins/madde/maemodeploystepfactory.cpp index 26f908f36d..d28925e639 100644 --- a/src/plugins/madde/maemodeploystepfactory.cpp +++ b/src/plugins/madde/maemodeploystepfactory.cpp @@ -45,7 +45,7 @@ #include <remotelinux/genericdirectuploadstep.h> #include <remotelinux/uploadandinstalltarpackagestep.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace ProjectExplorer; using namespace RemoteLinux; diff --git a/src/plugins/madde/maemodeviceconfigwizard.cpp b/src/plugins/madde/maemodeviceconfigwizard.cpp index 7fec768932..6b77357e8b 100644 --- a/src/plugins/madde/maemodeviceconfigwizard.cpp +++ b/src/plugins/madde/maemodeviceconfigwizard.cpp @@ -47,12 +47,12 @@ #include <utils/fileutils.h> #include <utils/ssh/sshkeygenerator.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtGui/QButtonGroup> -#include <QtGui/QDesktopServices> -#include <QtGui/QMessageBox> -#include <QtGui/QWizardPage> +#include <QDir> +#include <QFile> +#include <QButtonGroup> +#include <QDesktopServices> +#include <QMessageBox> +#include <QWizardPage> using namespace RemoteLinux; using namespace Utils; diff --git a/src/plugins/madde/maemoglobal.cpp b/src/plugins/madde/maemoglobal.cpp index cd73b6278b..d59998d803 100644 --- a/src/plugins/madde/maemoglobal.cpp +++ b/src/plugins/madde/maemoglobal.cpp @@ -40,11 +40,11 @@ #include <remotelinux/remotelinux_constants.h> #include <utils/environment.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtCore/QString> -#include <QtGui/QDesktopServices> +#include <QDir> +#include <QFileInfo> +#include <QProcess> +#include <QString> +#include <QDesktopServices> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Constants; diff --git a/src/plugins/madde/maemoglobal.h b/src/plugins/madde/maemoglobal.h index 5835e3f1bc..f32e2a3054 100644 --- a/src/plugins/madde/maemoglobal.h +++ b/src/plugins/madde/maemoglobal.h @@ -37,8 +37,8 @@ #include <remotelinux/portlist.h> #include <utils/environment.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QSharedPointer> +#include <QCoreApplication> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QProcess; diff --git a/src/plugins/madde/maemoinstalltosysrootstep.cpp b/src/plugins/madde/maemoinstalltosysrootstep.cpp index 56af8891f6..efacf68bef 100644 --- a/src/plugins/madde/maemoinstalltosysrootstep.cpp +++ b/src/plugins/madde/maemoinstalltosysrootstep.cpp @@ -45,11 +45,11 @@ #include <remotelinux/deploymentinfo.h> #include <remotelinux/remotelinuxdeployconfiguration.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QLatin1Char> -#include <QtCore/QProcess> -#include <QtCore/QWeakPointer> +#include <QDir> +#include <QFileInfo> +#include <QLatin1Char> +#include <QProcess> +#include <QWeakPointer> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/madde/maemoinstalltosysrootstep.h b/src/plugins/madde/maemoinstalltosysrootstep.h index a2fde761b5..57558bc193 100644 --- a/src/plugins/madde/maemoinstalltosysrootstep.h +++ b/src/plugins/madde/maemoinstalltosysrootstep.h @@ -37,7 +37,7 @@ #include <projectexplorer/buildstep.h> #include <remotelinux/deployablefile.h> -#include <QtCore/QStringList> +#include <QStringList> QT_FORWARD_DECLARE_CLASS(QProcess) diff --git a/src/plugins/madde/maemomountspecification.h b/src/plugins/madde/maemomountspecification.h index 45a3ed835b..9f06e6ad8a 100644 --- a/src/plugins/madde/maemomountspecification.h +++ b/src/plugins/madde/maemomountspecification.h @@ -32,7 +32,7 @@ #ifndef MAEMOMOUNTSPECIFICATION_H #define MAEMOMOUNTSPECIFICATION_H -#include <QtCore/QString> +#include <QString> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemopackagecreationfactory.cpp b/src/plugins/madde/maemopackagecreationfactory.cpp index b9235643a8..dbb4230176 100644 --- a/src/plugins/madde/maemopackagecreationfactory.cpp +++ b/src/plugins/madde/maemopackagecreationfactory.cpp @@ -41,7 +41,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using ProjectExplorer::BuildStepList; using ProjectExplorer::BuildStep; diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp index 6866dcea69..288b63c715 100644 --- a/src/plugins/madde/maemopackagecreationstep.cpp +++ b/src/plugins/madde/maemopackagecreationstep.cpp @@ -44,9 +44,9 @@ #include <utils/environment.h> #include <utils/fileutils.h> -#include <QtCore/QDateTime> -#include <QtCore/QProcess> -#include <QtCore/QRegExp> +#include <QDateTime> +#include <QProcess> +#include <QRegExp> namespace { const QLatin1String MagicFileName(".qtcreator"); diff --git a/src/plugins/madde/maemopackagecreationwidget.cpp b/src/plugins/madde/maemopackagecreationwidget.cpp index 4e00e3c0f8..7721e1839d 100644 --- a/src/plugins/madde/maemopackagecreationwidget.cpp +++ b/src/plugins/madde/maemopackagecreationwidget.cpp @@ -42,10 +42,10 @@ #include <qt4projectmanager/qt4buildconfiguration.h> #include <utils/qtcassert.h> -#include <QtCore/QTimer> -#include <QtGui/QFileDialog> -#include <QtGui/QImageReader> -#include <QtGui/QMessageBox> +#include <QTimer> +#include <QFileDialog> +#include <QImageReader> +#include <QMessageBox> using namespace ProjectExplorer; diff --git a/src/plugins/madde/maemopublishedprojectmodel.cpp b/src/plugins/madde/maemopublishedprojectmodel.cpp index 162ce28538..f9ce582486 100644 --- a/src/plugins/madde/maemopublishedprojectmodel.cpp +++ b/src/plugins/madde/maemopublishedprojectmodel.cpp @@ -31,7 +31,7 @@ #include "maemopublishedprojectmodel.h" -#include <QtCore/QFileInfo> +#include <QFileInfo> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemopublishedprojectmodel.h b/src/plugins/madde/maemopublishedprojectmodel.h index 2313a42180..a8952e2e2f 100644 --- a/src/plugins/madde/maemopublishedprojectmodel.h +++ b/src/plugins/madde/maemopublishedprojectmodel.h @@ -32,9 +32,9 @@ #ifndef MAEMOPUBLISHEDPROJECTMODEL_H #define MAEMOPUBLISHEDPROJECTMODEL_H -#include <QtCore/QSet> -#include <QtCore/QStringList> -#include <QtGui/QFileSystemModel> +#include <QSet> +#include <QStringList> +#include <QFileSystemModel> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemopublisherfremantlefree.cpp b/src/plugins/madde/maemopublisherfremantlefree.cpp index b6361e2a21..f73366c66f 100644 --- a/src/plugins/madde/maemopublisherfremantlefree.cpp +++ b/src/plugins/madde/maemopublisherfremantlefree.cpp @@ -49,11 +49,11 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QStringList> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfo> +#include <QStringList> +#include <QIcon> using namespace Core; using namespace Qt4ProjectManager; diff --git a/src/plugins/madde/maemopublisherfremantlefree.h b/src/plugins/madde/maemopublisherfremantlefree.h index 675870107f..298612fba5 100644 --- a/src/plugins/madde/maemopublisherfremantlefree.h +++ b/src/plugins/madde/maemopublisherfremantlefree.h @@ -34,8 +34,8 @@ #include <utils/ssh/sshconnection.h> -#include <QtCore/QObject> -#include <QtCore/QProcess> +#include <QObject> +#include <QProcess> namespace ProjectExplorer { class Project; diff --git a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h index 0072b353e3..28a433b32f 100644 --- a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h +++ b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h @@ -33,8 +33,8 @@ #ifndef MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H #define MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H -#include <QtCore/QList> -#include <QtGui/QWizardPage> +#include <QList> +#include <QWizardPage> namespace ProjectExplorer { class Project; } namespace Qt4ProjectManager { class Qt4BuildConfiguration; } diff --git a/src/plugins/madde/maemopublishingfileselectiondialog.h b/src/plugins/madde/maemopublishingfileselectiondialog.h index e8ab53fb8b..ae8cdfeba8 100644 --- a/src/plugins/madde/maemopublishingfileselectiondialog.h +++ b/src/plugins/madde/maemopublishingfileselectiondialog.h @@ -32,8 +32,8 @@ #ifndef MAEMOPUBLISHINGFILESELECTIONDIALOG_H #define MAEMOPUBLISHINGFILESELECTIONDIALOG_H -#include <QtCore/QStringList> -#include <QtGui/QDialog> +#include <QStringList> +#include <QDialog> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp b/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp index 3ba772e632..8f12c1babb 100644 --- a/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp +++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp @@ -32,7 +32,7 @@ #include "maemopublishingresultpagefremantlefree.h" #include "ui_maemopublishingresultpagefremantlefree.h" -#include <QtGui/QAbstractButton> +#include <QAbstractButton> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemopublishingresultpagefremantlefree.h b/src/plugins/madde/maemopublishingresultpagefremantlefree.h index 936e94cd6a..029a575422 100644 --- a/src/plugins/madde/maemopublishingresultpagefremantlefree.h +++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.h @@ -34,7 +34,7 @@ #define MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H #include "maemopublisherfremantlefree.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.cpp b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.cpp index 9413f3512f..d044c30c4b 100644 --- a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.cpp +++ b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.cpp @@ -36,7 +36,7 @@ #include <utils/pathchooser.h> -#include <QtCore/QDir> +#include <QDir> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h index d79540d255..154a085bab 100644 --- a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h +++ b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h @@ -33,7 +33,7 @@ #ifndef MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H #define MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemoqemumanager.cpp b/src/plugins/madde/maemoqemumanager.cpp index d1b3e53713..78b18409f1 100644 --- a/src/plugins/madde/maemoqemumanager.cpp +++ b/src/plugins/madde/maemoqemumanager.cpp @@ -56,15 +56,15 @@ #include <remotelinux/remotelinuxrunconfiguration.h> #include <utils/filesystemwatcher.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QList> -#include <QtCore/QSet> -#include <QtCore/QStringBuilder> - -#include <QtGui/QAction> -#include <QtGui/QDesktopServices> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QDir> +#include <QList> +#include <QSet> +#include <QStringBuilder> + +#include <QAction> +#include <QDesktopServices> +#include <QMessageBox> #include <limits.h> diff --git a/src/plugins/madde/maemoqemumanager.h b/src/plugins/madde/maemoqemumanager.h index 6ce85cd4bc..0fa3894ff6 100644 --- a/src/plugins/madde/maemoqemumanager.h +++ b/src/plugins/madde/maemoqemumanager.h @@ -36,11 +36,11 @@ #include "maemoconstants.h" #include "maemoqemuruntime.h" -#include <QtCore/QMap> -#include <QtCore/QObject> -#include <QtCore/QProcess> +#include <QMap> +#include <QObject> +#include <QProcess> -#include <QtGui/QIcon> +#include <QIcon> QT_FORWARD_DECLARE_CLASS(QAction) QT_FORWARD_DECLARE_CLASS(QStringList) diff --git a/src/plugins/madde/maemoqemuruntime.h b/src/plugins/madde/maemoqemuruntime.h index 993ed16b09..04adfd255a 100644 --- a/src/plugins/madde/maemoqemuruntime.h +++ b/src/plugins/madde/maemoqemuruntime.h @@ -36,11 +36,11 @@ #include <remotelinux/portlist.h> -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QProcessEnvironment> -#include <QtCore/QString> +#include <QHash> +#include <QList> +#include <QPair> +#include <QProcessEnvironment> +#include <QString> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemoqemuruntimeparser.cpp b/src/plugins/madde/maemoqemuruntimeparser.cpp index 2445596ed7..0c6979ce73 100644 --- a/src/plugins/madde/maemoqemuruntimeparser.cpp +++ b/src/plugins/madde/maemoqemuruntimeparser.cpp @@ -37,10 +37,10 @@ #include <qtsupport/baseqtversion.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QProcess> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> +#include <QDir> +#include <QProcess> +#include <QStringList> +#include <QTextStream> using namespace RemoteLinux; diff --git a/src/plugins/madde/maemoqemuruntimeparser.h b/src/plugins/madde/maemoqemuruntimeparser.h index 1e5f9524af..0e881c3a0f 100644 --- a/src/plugins/madde/maemoqemuruntimeparser.h +++ b/src/plugins/madde/maemoqemuruntimeparser.h @@ -34,8 +34,8 @@ #include "maemoqemuruntime.h" -#include <QtCore/QString> -#include <QtCore/QXmlStreamReader> +#include <QString> +#include <QXmlStreamReader> namespace QtSupport { class BaseQtVersion; diff --git a/src/plugins/madde/maemoqemusettings.cpp b/src/plugins/madde/maemoqemusettings.cpp index 328a50fc9d..57a1db19fb 100644 --- a/src/plugins/madde/maemoqemusettings.cpp +++ b/src/plugins/madde/maemoqemusettings.cpp @@ -33,7 +33,7 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> +#include <QSettings> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemoqemusettingswidget.h b/src/plugins/madde/maemoqemusettingswidget.h index 6e4b7c3ea8..27a90147c7 100644 --- a/src/plugins/madde/maemoqemusettingswidget.h +++ b/src/plugins/madde/maemoqemusettingswidget.h @@ -32,7 +32,7 @@ #ifndef MAEMOQEMUSETTINGSWIDGET_H #define MAEMOQEMUSETTINGSWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemoqtversion.cpp b/src/plugins/madde/maemoqtversion.cpp index 7fa9e18d15..a1e014baf6 100644 --- a/src/plugins/madde/maemoqtversion.cpp +++ b/src/plugins/madde/maemoqtversion.cpp @@ -37,10 +37,10 @@ #include <qt4projectmanager/qt4projectmanagerconstants.h> #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QTextStream> +#include <QCoreApplication> +#include <QFile> +#include <QDir> +#include <QTextStream> using namespace Qt4ProjectManager; diff --git a/src/plugins/madde/maemoqtversionfactory.cpp b/src/plugins/madde/maemoqtversionfactory.cpp index 02456f52fa..900867c839 100644 --- a/src/plugins/madde/maemoqtversionfactory.cpp +++ b/src/plugins/madde/maemoqtversionfactory.cpp @@ -37,7 +37,7 @@ #include <qtsupport/qtsupportconstants.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemoremotecopyfacility.cpp b/src/plugins/madde/maemoremotecopyfacility.cpp index 5ec6af35c2..849c497514 100644 --- a/src/plugins/madde/maemoremotecopyfacility.cpp +++ b/src/plugins/madde/maemoremotecopyfacility.cpp @@ -37,7 +37,7 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QDir> +#include <QDir> using namespace RemoteLinux; using namespace Utils; diff --git a/src/plugins/madde/maemoremotecopyfacility.h b/src/plugins/madde/maemoremotecopyfacility.h index f4cd100663..2a19950e5d 100644 --- a/src/plugins/madde/maemoremotecopyfacility.h +++ b/src/plugins/madde/maemoremotecopyfacility.h @@ -35,10 +35,10 @@ #include <remotelinux/deployablefile.h> -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QList> +#include <QObject> +#include <QSharedPointer> +#include <QString> namespace Utils { class SshConnection; diff --git a/src/plugins/madde/maemoremotemounter.cpp b/src/plugins/madde/maemoremotemounter.cpp index d0620e3073..fd39e54855 100644 --- a/src/plugins/madde/maemoremotemounter.cpp +++ b/src/plugins/madde/maemoremotemounter.cpp @@ -43,7 +43,7 @@ #include <remotelinux/remotelinuxusedportsgatherer.h> #include <utils/qtcassert.h> -#include <QtCore/QTimer> +#include <QTimer> using namespace Qt4ProjectManager; using namespace RemoteLinux; diff --git a/src/plugins/madde/maemoremotemounter.h b/src/plugins/madde/maemoremotemounter.h index 59455cec2e..d01cdec728 100644 --- a/src/plugins/madde/maemoremotemounter.h +++ b/src/plugins/madde/maemoremotemounter.h @@ -35,11 +35,11 @@ #include "maemomountspecification.h" -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QProcess> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QList> +#include <QObject> +#include <QProcess> +#include <QSharedPointer> +#include <QString> QT_FORWARD_DECLARE_CLASS(QTimer) diff --git a/src/plugins/madde/maemoremotemountsmodel.h b/src/plugins/madde/maemoremotemountsmodel.h index c8c297bcf9..29083ab4ef 100644 --- a/src/plugins/madde/maemoremotemountsmodel.h +++ b/src/plugins/madde/maemoremotemountsmodel.h @@ -35,10 +35,10 @@ #include "maemomountspecification.h" -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QVariantMap> +#include <QAbstractTableModel> +#include <QList> +#include <QString> +#include <QVariantMap> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemorunconfiguration.cpp b/src/plugins/madde/maemorunconfiguration.cpp index 9d6a967e0d..5dc832829e 100644 --- a/src/plugins/madde/maemorunconfiguration.cpp +++ b/src/plugins/madde/maemorunconfiguration.cpp @@ -44,8 +44,8 @@ #include <remotelinux/portlist.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QDir> +#include <QFileInfo> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/madde/maemorunconfigurationwidget.cpp b/src/plugins/madde/maemorunconfigurationwidget.cpp index be3a0bd6ad..7ad3831ba9 100644 --- a/src/plugins/madde/maemorunconfigurationwidget.cpp +++ b/src/plugins/madde/maemorunconfigurationwidget.cpp @@ -44,21 +44,21 @@ #include <remotelinux/remotelinuxrunconfigurationwidget.h> #include <utils/detailswidget.h> -#include <QtGui/QButtonGroup> -#include <QtCore/QCoreApplication> -#include <QtGui/QComboBox> -#include <QtGui/QFileDialog> -#include <QtGui/QFormLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QRadioButton> -#include <QtGui/QTableView> -#include <QtGui/QToolButton> +#include <QButtonGroup> +#include <QCoreApplication> +#include <QComboBox> +#include <QFileDialog> +#include <QFormLayout> +#include <QGroupBox> +#include <QHBoxLayout> +#include <QHeaderView> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> +#include <QPushButton> +#include <QRadioButton> +#include <QTableView> +#include <QToolButton> using namespace Qt4ProjectManager; using namespace RemoteLinux; diff --git a/src/plugins/madde/maemorunconfigurationwidget.h b/src/plugins/madde/maemorunconfigurationwidget.h index 521349f04f..d25e1b69db 100644 --- a/src/plugins/madde/maemorunconfigurationwidget.h +++ b/src/plugins/madde/maemorunconfigurationwidget.h @@ -32,7 +32,7 @@ #ifndef MAEMORUNCONFIGURATIONWIDGET_H #define MAEMORUNCONFIGURATIONWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/madde/maemosettingspages.cpp b/src/plugins/madde/maemosettingspages.cpp index d50761ea59..d93f8588f2 100644 --- a/src/plugins/madde/maemosettingspages.cpp +++ b/src/plugins/madde/maemosettingspages.cpp @@ -36,14 +36,14 @@ #include <coreplugin/icore.h> #include <remotelinux/remotelinux_constants.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QFrame> -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QIcon> -#include <QtGui/QMainWindow> +#include <QCoreApplication> +#include <QDialog> +#include <QDialogButtonBox> +#include <QFrame> +#include <QLabel> +#include <QVBoxLayout> +#include <QIcon> +#include <QMainWindow> namespace Madde { namespace Internal { diff --git a/src/plugins/madde/maemotoolchain.cpp b/src/plugins/madde/maemotoolchain.cpp index 8381940e80..e4de7cc401 100644 --- a/src/plugins/madde/maemotoolchain.cpp +++ b/src/plugins/madde/maemotoolchain.cpp @@ -42,10 +42,10 @@ #include <utils/environment.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> +#include <QDir> +#include <QFileInfo> +#include <QLabel> +#include <QVBoxLayout> using namespace Qt4ProjectManager; diff --git a/src/plugins/madde/qt4maemodeployconfiguration.cpp b/src/plugins/madde/qt4maemodeployconfiguration.cpp index d552b963cf..9b01066d10 100644 --- a/src/plugins/madde/qt4maemodeployconfiguration.cpp +++ b/src/plugins/madde/qt4maemodeployconfiguration.cpp @@ -46,8 +46,8 @@ #include <remotelinux/deploymentinfo.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QString> +#include <QFileInfo> +#include <QString> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/madde/qt4maemotarget.cpp b/src/plugins/madde/qt4maemotarget.cpp index d6abdc1eb8..5b87fb329e 100644 --- a/src/plugins/madde/qt4maemotarget.cpp +++ b/src/plugins/madde/qt4maemotarget.cpp @@ -57,19 +57,19 @@ #include <utils/filesystemwatcher.h> #include <utils/qtcassert.h> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtCore/QBuffer> -#include <QtCore/QDateTime> -#include <QtCore/QLocale> -#include <QtCore/QRegExp> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtCore/QStringList> -#include <QtGui/QIcon> -#include <QtGui/QMessageBox> +#include <QApplication> +#include <QMainWindow> +#include <QBuffer> +#include <QDateTime> +#include <QLocale> +#include <QRegExp> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QProcess> +#include <QStringList> +#include <QIcon> +#include <QMessageBox> #include <cctype> diff --git a/src/plugins/madde/qt4maemotarget.h b/src/plugins/madde/qt4maemotarget.h index 2d96ba5804..4489521981 100644 --- a/src/plugins/madde/qt4maemotarget.h +++ b/src/plugins/madde/qt4maemotarget.h @@ -35,9 +35,9 @@ #include <remotelinux/abstractembeddedlinuxtarget.h> -#include <QtCore/QIODevice> -#include <QtCore/QSharedPointer> -#include <QtGui/QIcon> +#include <QIODevice> +#include <QSharedPointer> +#include <QIcon> QT_FORWARD_DECLARE_CLASS(QDateTime) QT_FORWARD_DECLARE_CLASS(QFile) diff --git a/src/plugins/mercurial/annotationhighlighter.h b/src/plugins/mercurial/annotationhighlighter.h index d6379ecfd1..6dbbe948cd 100644 --- a/src/plugins/mercurial/annotationhighlighter.h +++ b/src/plugins/mercurial/annotationhighlighter.h @@ -34,7 +34,7 @@ #define ANNOTATIONHIGHLIGHTER_H #include <vcsbase/baseannotationhighlighter.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Mercurial { namespace Internal { diff --git a/src/plugins/mercurial/clonewizard.h b/src/plugins/mercurial/clonewizard.h index eea2b38196..d78c99f050 100644 --- a/src/plugins/mercurial/clonewizard.h +++ b/src/plugins/mercurial/clonewizard.h @@ -35,7 +35,7 @@ #include <vcsbase/basecheckoutwizard.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Mercurial { namespace Internal { diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index b174da8e35..daaaf1dd9f 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.cpp @@ -35,8 +35,8 @@ #include <vcsbase/submitfilemodel.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED +#include <QDebug> +#include <QDir> //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED using namespace Mercurial::Internal; using namespace VcsBase; diff --git a/src/plugins/mercurial/commiteditor.h b/src/plugins/mercurial/commiteditor.h index ea9a8a24cc..8bd0a45451 100644 --- a/src/plugins/mercurial/commiteditor.h +++ b/src/plugins/mercurial/commiteditor.h @@ -36,7 +36,7 @@ #include <vcsbase/vcsbaseclient.h> #include <vcsbase/vcsbasesubmiteditor.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> namespace VcsBase { class SubmitFileModel; diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 13343d208c..5a8117a726 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -42,11 +42,11 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTextCodec> -#include <QtCore/QTextStream> -#include <QtCore/QVariant> +#include <QDir> +#include <QFileInfo> +#include <QTextCodec> +#include <QTextStream> +#include <QVariant> namespace Mercurial { namespace Internal { diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp index 76601c9a4f..81f7cb468c 100644 --- a/src/plugins/mercurial/mercurialcommitwidget.cpp +++ b/src/plugins/mercurial/mercurialcommitwidget.cpp @@ -37,11 +37,11 @@ #include <texteditor/texteditorconstants.h> #include <utils/qtcassert.h> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextEdit> +#include <QSyntaxHighlighter> +#include <QTextEdit> -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QDebug> +#include <QRegExp> //see the git submit widget for details of the syntax Highlighter diff --git a/src/plugins/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp index 9dcf57fb5b..bbb42a8905 100644 --- a/src/plugins/mercurial/mercurialcontrol.cpp +++ b/src/plugins/mercurial/mercurialcontrol.cpp @@ -36,10 +36,10 @@ #include <vcsbase/vcsbaseclientsettings.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QFileInfo> -#include <QtCore/QVariant> -#include <QtCore/QStringList> -#include <QtCore/QDir> +#include <QFileInfo> +#include <QVariant> +#include <QStringList> +#include <QDir> using namespace Mercurial::Internal; diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp index 34d4d6c978..b47c5b9d0e 100644 --- a/src/plugins/mercurial/mercurialeditor.cpp +++ b/src/plugins/mercurial/mercurialeditor.cpp @@ -39,12 +39,12 @@ #include <coreplugin/editormanager/editormanager.h> #include <vcsbase/diffhighlighter.h> -#include <QtCore/QString> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QString> +#include <QTextCursor> +#include <QTextBlock> +#include <QDir> +#include <QFileInfo> +#include <QDebug> using namespace Mercurial::Internal; using namespace Mercurial; diff --git a/src/plugins/mercurial/mercurialeditor.h b/src/plugins/mercurial/mercurialeditor.h index 8cd7b7e781..3261b17d95 100644 --- a/src/plugins/mercurial/mercurialeditor.h +++ b/src/plugins/mercurial/mercurialeditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Mercurial { namespace Internal { diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 48305082f5..9633f22830 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -62,16 +62,16 @@ #include <vcsbase/vcsbaseeditor.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QMainWindow> -#include <QtCore/QtDebug> -#include <QtCore/QtGlobal> -#include <QtCore/QDir> -#include <QtGui/QDialog> -#include <QtGui/QFileDialog> -#include <QtCore/QTemporaryFile> +#include <QtPlugin> +#include <QAction> +#include <QMenu> +#include <QMainWindow> +#include <QtDebug> +#include <QtGlobal> +#include <QDir> +#include <QDialog> +#include <QFileDialog> +#include <QTemporaryFile> using namespace Mercurial::Internal; diff --git a/src/plugins/mercurial/mercurialsettings.cpp b/src/plugins/mercurial/mercurialsettings.cpp index aa9abef307..22020abca8 100644 --- a/src/plugins/mercurial/mercurialsettings.cpp +++ b/src/plugins/mercurial/mercurialsettings.cpp @@ -33,7 +33,7 @@ #include "mercurialsettings.h" #include "constants.h" -#include <QtCore/QSettings> +#include <QSettings> namespace Mercurial { namespace Internal { diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp index e212435d24..a6b189f6d1 100644 --- a/src/plugins/mercurial/optionspage.cpp +++ b/src/plugins/mercurial/optionspage.cpp @@ -38,7 +38,7 @@ #include <utils/pathchooser.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QTextStream> +#include <QTextStream> using namespace Mercurial::Internal; using namespace Mercurial; diff --git a/src/plugins/mercurial/optionspage.h b/src/plugins/mercurial/optionspage.h index 23fc70c653..6ec6c8799b 100644 --- a/src/plugins/mercurial/optionspage.h +++ b/src/plugins/mercurial/optionspage.h @@ -37,8 +37,8 @@ #include <vcsbase/vcsbaseoptionspage.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> namespace Mercurial { namespace Internal { diff --git a/src/plugins/mercurial/revertdialog.h b/src/plugins/mercurial/revertdialog.h index 3ff1bc3b3e..3f1abfa115 100644 --- a/src/plugins/mercurial/revertdialog.h +++ b/src/plugins/mercurial/revertdialog.h @@ -35,7 +35,7 @@ #include "ui_revertdialog.h" -#include <QtGui/QDialog> +#include <QDialog> namespace Mercurial { namespace Internal { diff --git a/src/plugins/mercurial/srcdestdialog.h b/src/plugins/mercurial/srcdestdialog.h index 9463f931ab..c7ce9149fb 100644 --- a/src/plugins/mercurial/srcdestdialog.h +++ b/src/plugins/mercurial/srcdestdialog.h @@ -34,7 +34,7 @@ #define SRCDESTDIALOG_H #include <utils/pathchooser.h> -#include <QtGui/QDialog> +#include <QDialog> namespace Mercurial { namespace Internal { diff --git a/src/plugins/perforce/changenumberdialog.cpp b/src/plugins/perforce/changenumberdialog.cpp index 3461930e7e..a0c723caf6 100644 --- a/src/plugins/perforce/changenumberdialog.cpp +++ b/src/plugins/perforce/changenumberdialog.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtGui/QIntValidator> +#include <QIntValidator> #include "changenumberdialog.h" diff --git a/src/plugins/perforce/changenumberdialog.h b/src/plugins/perforce/changenumberdialog.h index c9bc7d2dce..592892c37d 100644 --- a/src/plugins/perforce/changenumberdialog.h +++ b/src/plugins/perforce/changenumberdialog.h @@ -33,7 +33,7 @@ #ifndef CHANGENUMBERDIALOG_H #define CHANGENUMBERDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> #include "ui_changenumberdialog.h" diff --git a/src/plugins/perforce/pendingchangesdialog.cpp b/src/plugins/perforce/pendingchangesdialog.cpp index 6bfaec3d6b..0807e56239 100644 --- a/src/plugins/perforce/pendingchangesdialog.cpp +++ b/src/plugins/perforce/pendingchangesdialog.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtCore/QRegExp> +#include <QRegExp> #include "pendingchangesdialog.h" diff --git a/src/plugins/perforce/pendingchangesdialog.h b/src/plugins/perforce/pendingchangesdialog.h index eb360c8c9a..772c1bf353 100644 --- a/src/plugins/perforce/pendingchangesdialog.h +++ b/src/plugins/perforce/pendingchangesdialog.h @@ -33,7 +33,7 @@ #ifndef PENDINGCHANGESDIALOG_H #define PENDINGCHANGESDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> #include "ui_pendingchangesdialog.h" diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp index e347bb8e96..ab42dbf46a 100644 --- a/src/plugins/perforce/perforcechecker.cpp +++ b/src/plugins/perforce/perforcechecker.cpp @@ -35,13 +35,13 @@ #include <utils/qtcassert.h> #include <utils/synchronousprocess.h> -#include <QtCore/QRegExp> -#include <QtCore/QTimer> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> +#include <QRegExp> +#include <QTimer> +#include <QFileInfo> +#include <QDir> -#include <QtGui/QApplication> -#include <QtGui/QCursor> +#include <QApplication> +#include <QCursor> namespace Perforce { namespace Internal { diff --git a/src/plugins/perforce/perforcechecker.h b/src/plugins/perforce/perforcechecker.h index 68b489664f..7ed32304bf 100644 --- a/src/plugins/perforce/perforcechecker.h +++ b/src/plugins/perforce/perforcechecker.h @@ -33,8 +33,8 @@ #ifndef PERFORCECHECKER_H #define PERFORCECHECKER_H -#include <QtCore/QObject> -#include <QtCore/QProcess> +#include <QObject> +#include <QProcess> namespace Perforce { namespace Internal { diff --git a/src/plugins/perforce/perforceconstants.h b/src/plugins/perforce/perforceconstants.h index 3eabcca4ab..dead719bc8 100644 --- a/src/plugins/perforce/perforceconstants.h +++ b/src/plugins/perforce/perforceconstants.h @@ -33,7 +33,7 @@ #ifndef PERFORCE_CONSTANTS_H #define PERFORCE_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Perforce { namespace Constants { diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp index d55b8db62e..9aab63c648 100644 --- a/src/plugins/perforce/perforceeditor.cpp +++ b/src/plugins/perforce/perforceeditor.cpp @@ -40,20 +40,20 @@ #include <utils/qtcassert.h> #include <vcsbase/diffhighlighter.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QTextStream> +#include <QDebug> +#include <QFileInfo> +#include <QProcess> +#include <QRegExp> +#include <QSet> +#include <QTextStream> -#include <QtGui/QAction> -#include <QtGui/QKeyEvent> -#include <QtGui/QLayout> -#include <QtGui/QMenu> -#include <QtGui/QTextCursor> -#include <QtGui/QTextEdit> -#include <QtGui/QTextBlock> +#include <QAction> +#include <QKeyEvent> +#include <QLayout> +#include <QMenu> +#include <QTextCursor> +#include <QTextEdit> +#include <QTextBlock> namespace Perforce { namespace Internal { diff --git a/src/plugins/perforce/perforceeditor.h b/src/plugins/perforce/perforceeditor.h index e3cb40ad5d..bbe2d1a8d1 100644 --- a/src/plugins/perforce/perforceeditor.h +++ b/src/plugins/perforce/perforceeditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Perforce { namespace Internal { diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 7146b5fe97..786579848e 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -62,18 +62,18 @@ #include <vcsbase/vcsbaseoutputwindow.h> #include <vcsbase/vcsbaseeditorparameterwidget.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QTextCodec> - -#include <QtGui/QAction> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QtPlugin> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QSettings> +#include <QTextCodec> + +#include <QAction> +#include <QFileDialog> +#include <QMainWindow> +#include <QMenu> +#include <QMessageBox> static const VcsBase::VcsBaseEditorParameters editorParameters[] = { { diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h index e5c808eb7a..1c2f7ed36c 100644 --- a/src/plugins/perforce/perforceplugin.h +++ b/src/plugins/perforce/perforceplugin.h @@ -39,11 +39,11 @@ #include <coreplugin/iversioncontrol.h> #include <vcsbase/vcsbaseplugin.h> -#include <QtCore/QObject> -#include <QtCore/QProcess> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtCore/QHash> +#include <QObject> +#include <QProcess> +#include <QStringList> +#include <QSharedPointer> +#include <QHash> QT_BEGIN_NAMESPACE class QFile; diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp index 306429afe6..e543f2b9cf 100644 --- a/src/plugins/perforce/perforcesettings.cpp +++ b/src/plugins/perforce/perforcesettings.cpp @@ -37,11 +37,11 @@ #include <utils/qtcassert.h> #include <utils/environment.h> -#include <QtCore/QSettings> -#include <QtCore/QStringList> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QSettings> +#include <QStringList> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfo> static const char groupC[] = "Perforce"; static const char commandKeyC[] = "Command"; diff --git a/src/plugins/perforce/perforcesettings.h b/src/plugins/perforce/perforcesettings.h index 8d31cfd158..880d07b7f1 100644 --- a/src/plugins/perforce/perforcesettings.h +++ b/src/plugins/perforce/perforcesettings.h @@ -33,8 +33,8 @@ #ifndef PERFOCESETTINGS_H #define PERFOCESETTINGS_H -#include <QtCore/QString> -#include <QtCore/QScopedPointer> +#include <QString> +#include <QScopedPointer> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/perforce/perforcesubmiteditor.cpp b/src/plugins/perforce/perforcesubmiteditor.cpp index 3d3f23593b..f49bb7d8cf 100644 --- a/src/plugins/perforce/perforcesubmiteditor.cpp +++ b/src/plugins/perforce/perforcesubmiteditor.cpp @@ -38,7 +38,7 @@ #include <vcsbase/submitfilemodel.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> +#include <QDebug> namespace Perforce { namespace Internal { diff --git a/src/plugins/perforce/perforcesubmiteditor.h b/src/plugins/perforce/perforcesubmiteditor.h index 9d5e38aea9..e60a22c996 100644 --- a/src/plugins/perforce/perforcesubmiteditor.h +++ b/src/plugins/perforce/perforcesubmiteditor.h @@ -35,8 +35,8 @@ #include <vcsbase/vcsbasesubmiteditor.h> -#include <QtCore/QStringList> -#include <QtCore/QMap> +#include <QStringList> +#include <QMap> namespace VcsBase { class SubmitFileModel; diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp index d2e4f2edc3..2a6ed543bf 100644 --- a/src/plugins/perforce/perforceversioncontrol.cpp +++ b/src/plugins/perforce/perforceversioncontrol.cpp @@ -37,8 +37,8 @@ #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QFileInfo> +#include <QDebug> namespace Perforce { namespace Internal { diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp index 729a60a8d7..c72f151db9 100644 --- a/src/plugins/perforce/settingspage.cpp +++ b/src/plugins/perforce/settingspage.cpp @@ -37,10 +37,10 @@ #include <vcsbase/vcsbaseconstants.h> -#include <QtGui/QApplication> -#include <QtGui/QLineEdit> -#include <QtGui/QFileDialog> -#include <QtCore/QTextStream> +#include <QApplication> +#include <QLineEdit> +#include <QFileDialog> +#include <QTextStream> using namespace Perforce::Internal; using namespace Utils; diff --git a/src/plugins/perforce/settingspage.h b/src/plugins/perforce/settingspage.h index d6070344d9..8d26f4a0e3 100644 --- a/src/plugins/perforce/settingspage.h +++ b/src/plugins/perforce/settingspage.h @@ -33,8 +33,8 @@ #ifndef SETTINGSPAGE_H #define SETTINGSPAGE_H -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QPointer> +#include <QWidget> #include <vcsbase/vcsbaseoptionspage.h> diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 947fa07af1..5ce223267a 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -32,13 +32,13 @@ #include "abi.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QtEndian> -#include <QtCore/QFile> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QSysInfo> +#include <QCoreApplication> +#include <QDebug> +#include <QtEndian> +#include <QFile> +#include <QString> +#include <QStringList> +#include <QSysInfo> /*! \class ProjectExplorer::Abi @@ -738,7 +738,7 @@ QList<Abi> Abi::abisOfBinary(const Utils::FileName &path) // Unit tests: #ifdef WITH_TESTS # include <QTest> -# include <QtCore/QFileInfo> +# include <QFileInfo> # include "projectexplorer.h" diff --git a/src/plugins/projectexplorer/abi.h b/src/plugins/projectexplorer/abi.h index 871d59ebbf..354fe9d18c 100644 --- a/src/plugins/projectexplorer/abi.h +++ b/src/plugins/projectexplorer/abi.h @@ -37,7 +37,7 @@ #include <utils/fileutils.h> -#include <QtCore/QList> +#include <QList> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/abiwidget.cpp b/src/plugins/projectexplorer/abiwidget.cpp index 7d2995a900..d85e9d8a00 100644 --- a/src/plugins/projectexplorer/abiwidget.cpp +++ b/src/plugins/projectexplorer/abiwidget.cpp @@ -33,9 +33,9 @@ #include "abiwidget.h" #include "abi.h" -#include <QtGui/QComboBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> +#include <QComboBox> +#include <QHBoxLayout> +#include <QLabel> /*! \class ProjectExplorer::AbiWidget diff --git a/src/plugins/projectexplorer/abiwidget.h b/src/plugins/projectexplorer/abiwidget.h index 38151575ac..3987e12364 100644 --- a/src/plugins/projectexplorer/abiwidget.h +++ b/src/plugins/projectexplorer/abiwidget.h @@ -35,7 +35,7 @@ #include "projectexplorer_export.h" -#include <QtGui/QWidget> +#include <QWidget> namespace ProjectExplorer { class Abi; diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index a0839e4ad4..f1baf3158c 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -41,9 +41,9 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> -#include <QtCore/QEventLoop> -#include <QtCore/QTimer> -#include <QtCore/QDir> +#include <QEventLoop> +#include <QTimer> +#include <QDir> using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index 218eb6f3cc..974c13ec6b 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -36,8 +36,8 @@ #include "buildstep.h" #include "processparameters.h" -#include <QtCore/QString> -#include <QtCore/QProcess> +#include <QString> +#include <QProcess> QT_BEGIN_NAMESPACE class QEventLoop; diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp index 36efc2f0f8..6d46e15f37 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.cpp +++ b/src/plugins/projectexplorer/allprojectsfilter.cpp @@ -35,7 +35,7 @@ #include "session.h" #include "project.h" -#include <QtCore/QVariant> +#include <QVariant> using namespace Core; using namespace Locator; diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h index 5c605eb1c0..a6ba46f337 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.h +++ b/src/plugins/projectexplorer/allprojectsfilter.h @@ -35,8 +35,8 @@ #include <locator/basefilefilter.h> -#include <QtCore/QFutureInterface> -#include <QtCore/QString> +#include <QFutureInterface> +#include <QString> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index 1a883c34c8..2952db901c 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/src/plugins/projectexplorer/allprojectsfind.cpp @@ -41,12 +41,12 @@ #include <texteditor/itexteditor.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QSettings> -#include <QtCore/QRegExp> +#include <QSettings> +#include <QRegExp> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QHBoxLayout> +#include <QGridLayout> +#include <QLabel> +#include <QHBoxLayout> using namespace Find; using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/allprojectsfind.h b/src/plugins/projectexplorer/allprojectsfind.h index df15dee6f0..0e92a5be34 100644 --- a/src/plugins/projectexplorer/allprojectsfind.h +++ b/src/plugins/projectexplorer/allprojectsfind.h @@ -35,7 +35,7 @@ #include <texteditor/basefilefind.h> -#include <QtCore/QPointer> +#include <QPointer> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index fb9a219563..af094f58d2 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -43,8 +43,8 @@ #include <utils/winutils.h> #endif -#include <QtCore/QTimer> -#include <QtCore/QTextCodec> +#include <QTimer> +#include <QTextCodec> #ifdef Q_OS_WIN #include <windows.h> diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h index 60eb26736b..c75d6e0b37 100644 --- a/src/plugins/projectexplorer/applicationlauncher.h +++ b/src/plugins/projectexplorer/applicationlauncher.h @@ -37,7 +37,7 @@ #include <utils/outputformat.h> -#include <QtCore/QProcess> +#include <QProcess> namespace Utils { class Environment; diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index edb525c6b4..7e48af826c 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -52,14 +52,14 @@ #include <utils/qtcassert.h> #include <utils/outputformatter.h> -#include <QtGui/QAction> -#include <QtGui/QVBoxLayout> -#include <QtGui/QTabWidget> -#include <QtGui/QToolButton> -#include <QtGui/QTabBar> -#include <QtGui/QMenu> - -#include <QtCore/QDebug> +#include <QAction> +#include <QVBoxLayout> +#include <QTabWidget> +#include <QToolButton> +#include <QTabBar> +#include <QMenu> + +#include <QDebug> enum { debug = 0 }; diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp index ac2acb5c16..ebe331af1b 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp @@ -37,7 +37,7 @@ #include <coreplugin/filemanager.h> #include <utils/projectintropage.h> -#include <QtCore/QDir> +#include <QDir> /*! \class ProjectExplorer::BaseProjectWizardDialog diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h index d5866b5c65..20e2716128 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.h +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h @@ -38,7 +38,7 @@ #include <coreplugin/basefilewizard.h> #include <utils/wizard.h> -#include <QtGui/QWizard> +#include <QWizard> namespace Utils { class ProjectIntroPage; diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 197a294bdd..8d5465671e 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -46,7 +46,7 @@ #include <utils/qtcassert.h> #include <utils/stringutils.h> -#include <QtCore/QProcess> +#include <QProcess> static const char BUILD_STEP_LIST_COUNT[] = "ProjectExplorer.BuildConfiguration.BuildStepListCount"; static const char BUILD_STEP_LIST_PREFIX[] = "ProjectExplorer.BuildConfiguration.BuildStepList."; diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 4401872831..5067ee64fd 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -38,7 +38,7 @@ #include <utils/environment.h> -#include <QtCore/QStringList> +#include <QStringList> namespace Utils { class AbstractMacroExpander; diff --git a/src/plugins/projectexplorer/buildconfigurationmodel.h b/src/plugins/projectexplorer/buildconfigurationmodel.h index fc9dcba60f..e0c4a94e7e 100644 --- a/src/plugins/projectexplorer/buildconfigurationmodel.h +++ b/src/plugins/projectexplorer/buildconfigurationmodel.h @@ -33,7 +33,7 @@ #ifndef BUILDCONFIGURATIONMODEL_H #define BUILDCONFIGURATIONMODEL_H -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace ProjectExplorer { class Target; diff --git a/src/plugins/projectexplorer/buildenvironmentwidget.cpp b/src/plugins/projectexplorer/buildenvironmentwidget.cpp index e7c518b721..acafb1eb38 100644 --- a/src/plugins/projectexplorer/buildenvironmentwidget.cpp +++ b/src/plugins/projectexplorer/buildenvironmentwidget.cpp @@ -37,8 +37,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QCheckBox> +#include <QVBoxLayout> +#include <QCheckBox> using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 083b02f58d..5011acf34e 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -50,18 +50,18 @@ #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QMetaType> -#include <QtCore/QList> -#include <QtCore/QHash> -#include <QtCore/QFutureWatcher> +#include <QDir> +#include <QTime> +#include <QTimer> +#include <QMetaType> +#include <QList> +#include <QHash> +#include <QFutureWatcher> #include <utils/QtConcurrentTools> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> +#include <QApplication> +#include <QMainWindow> static inline QString msgProgress(int progress, int total) { diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index 572609ef13..eff114e8b8 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -36,8 +36,8 @@ #include "projectexplorer_export.h" #include "buildstep.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> namespace ProjectExplorer { class Task; diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp index 91a02a7e25..7ae8818a38 100644 --- a/src/plugins/projectexplorer/buildprogress.cpp +++ b/src/plugins/projectexplorer/buildprogress.cpp @@ -35,10 +35,10 @@ #include <utils/stylehelper.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QFont> -#include <QtGui/QPixmap> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QFont> +#include <QPixmap> #include <QtDebug> using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/buildprogress.h b/src/plugins/projectexplorer/buildprogress.h index 7806cd6b8c..5a3266f2e2 100644 --- a/src/plugins/projectexplorer/buildprogress.h +++ b/src/plugins/projectexplorer/buildprogress.h @@ -35,9 +35,9 @@ #include "taskwindow.h" -#include <QtCore/QPointer> -#include <QtGui/QWidget> -#include <QtGui/QLabel> +#include <QPointer> +#include <QWidget> +#include <QLabel> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp index 7b609fcfaa..07cfe6e830 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp @@ -45,16 +45,16 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/buildmanager.h> -#include <QtCore/QMargins> -#include <QtCore/QTimer> -#include <QtCore/QCoreApplication> -#include <QtGui/QComboBox> -#include <QtGui/QInputDialog> -#include <QtGui/QLabel> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QVBoxLayout> +#include <QMargins> +#include <QTimer> +#include <QCoreApplication> +#include <QComboBox> +#include <QInputDialog> +#include <QLabel> +#include <QMenu> +#include <QMessageBox> +#include <QPushButton> +#include <QVBoxLayout> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h index 5899bae2cf..ff23e1783f 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.h +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h @@ -35,8 +35,8 @@ #include "iprojectproperties.h" -#include <QtGui/QWidget> -#include <QtGui/QIcon> +#include <QWidget> +#include <QIcon> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 1eccd30f8d..2739c209a9 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -36,8 +36,8 @@ #include "projectconfiguration.h" #include "projectexplorer_export.h" -#include <QtCore/QFutureInterface> -#include <QtGui/QWidget> +#include <QFutureInterface> +#include <QWidget> namespace ProjectExplorer { class Task; diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h index e816f42f2a..2db05a9847 100644 --- a/src/plugins/projectexplorer/buildsteplist.h +++ b/src/plugins/projectexplorer/buildsteplist.h @@ -37,7 +37,7 @@ #include "projectconfiguration.h" -#include <QtCore/QVariantMap> +#include <QVariantMap> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index b00f200bdc..21129190bc 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -42,18 +42,18 @@ #include <utils/qtcassert.h> #include <utils/detailswidget.h> -#include <QtCore/QSignalMapper> - -#include <QtCore/QPropertyAnimation> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QMenu> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QToolButton> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QGraphicsOpacityEffect> +#include <QSignalMapper> + +#include <QPropertyAnimation> +#include <QLabel> +#include <QPushButton> +#include <QMenu> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QToolButton> +#include <QMessageBox> +#include <QMainWindow> +#include <QGraphicsOpacityEffect> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/cesdkhandler.cpp b/src/plugins/projectexplorer/cesdkhandler.cpp index b83557fe9a..16202be333 100644 --- a/src/plugins/projectexplorer/cesdkhandler.cpp +++ b/src/plugins/projectexplorer/cesdkhandler.cpp @@ -34,9 +34,9 @@ #include <utils/environment.h> -#include <QtCore/QFile> -#include <QtCore/QDebug> -#include <QtCore/QXmlStreamReader> +#include <QFile> +#include <QDebug> +#include <QXmlStreamReader> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/cesdkhandler.h b/src/plugins/projectexplorer/cesdkhandler.h index 38d65ed44f..efeb6c3466 100644 --- a/src/plugins/projectexplorer/cesdkhandler.h +++ b/src/plugins/projectexplorer/cesdkhandler.h @@ -35,8 +35,8 @@ #include <projectexplorer/projectexplorer.h> -#include <QtCore/QStringList> -#include <QtCore/QDir> +#include <QStringList> +#include <QDir> namespace Utils { class Environment; diff --git a/src/plugins/projectexplorer/clangparser.h b/src/plugins/projectexplorer/clangparser.h index 2e0051e689..c6c7718975 100644 --- a/src/plugins/projectexplorer/clangparser.h +++ b/src/plugins/projectexplorer/clangparser.h @@ -36,7 +36,7 @@ #include "ioutputparser.h" #include "task.h" -#include <QtCore/QRegExp> +#include <QRegExp> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp index 7d2d5f5e2c..4089bc72eb 100644 --- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp @@ -37,7 +37,7 @@ #include <texteditor/icodestylepreferencesfactory.h> #include <texteditor/codestyleeditor.h> -#include <QtCore/QTextCodec> +#include <QTextCodec> using namespace TextEditor; using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index 7fe29a4860..2b941dc87c 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -43,14 +43,14 @@ #include <aggregation/aggregate.h> #include <extensionsystem/pluginmanager.h> -#include <QtGui/QKeyEvent> -#include <QtGui/QIcon> -#include <QtGui/QTextCharFormat> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QTextEdit> -#include <QtGui/QScrollBar> -#include <QtGui/QPlainTextEdit> +#include <QKeyEvent> +#include <QIcon> +#include <QTextCharFormat> +#include <QTextBlock> +#include <QTextCursor> +#include <QTextEdit> +#include <QScrollBar> +#include <QPlainTextEdit> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h index 9c1a3fd295..6a1844207d 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.h +++ b/src/plugins/projectexplorer/compileoutputwindow.h @@ -37,7 +37,7 @@ #include <coreplugin/outputwindow.h> #include <coreplugin/ioutputpane.h> -#include <QtCore/QHash> +#include <QHash> QT_BEGIN_NAMESPACE class QPlainTextEdit; diff --git a/src/plugins/projectexplorer/copytaskhandler.cpp b/src/plugins/projectexplorer/copytaskhandler.cpp index 271e2d037a..eb3b4db605 100644 --- a/src/plugins/projectexplorer/copytaskhandler.cpp +++ b/src/plugins/projectexplorer/copytaskhandler.cpp @@ -36,10 +36,10 @@ #include <coreplugin/coreconstants.h> -#include <QtCore/QDir> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QClipboard> +#include <QDir> +#include <QAction> +#include <QApplication> +#include <QClipboard> using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp index e478cdda96..04d5d913ba 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.cpp +++ b/src/plugins/projectexplorer/currentprojectfilter.cpp @@ -34,7 +34,7 @@ #include "projectexplorer.h" #include "project.h" -#include <QtCore/QtDebug> +#include <QtDebug> using namespace Core; using namespace Locator; diff --git a/src/plugins/projectexplorer/currentprojectfilter.h b/src/plugins/projectexplorer/currentprojectfilter.h index 66c0345701..1c963100b7 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.h +++ b/src/plugins/projectexplorer/currentprojectfilter.h @@ -35,7 +35,7 @@ #include <locator/basefilefilter.h> -#include <QtCore/QFutureInterface> +#include <QFutureInterface> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp index 62c7dbceb4..6edab82dc2 100644 --- a/src/plugins/projectexplorer/currentprojectfind.cpp +++ b/src/plugins/projectexplorer/currentprojectfind.cpp @@ -39,10 +39,10 @@ #include <coreplugin/ifile.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtGui/QLabel> -#include <QtGui/QHBoxLayout> +#include <QDebug> +#include <QSettings> +#include <QLabel> +#include <QHBoxLayout> using namespace Find; using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp b/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp index 3d8c6c7ce0..c34fe3581e 100644 --- a/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp +++ b/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp @@ -42,12 +42,12 @@ #include <utils/pathchooser.h> #include <utils/debuggerlanguagechooser.h> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QFormLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> +#include <QCheckBox> +#include <QComboBox> +#include <QFormLayout> +#include <QHBoxLayout> +#include <QLabel> +#include <QLineEdit> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/customexecutableconfigurationwidget.h b/src/plugins/projectexplorer/customexecutableconfigurationwidget.h index 008c036b90..7bccc9785a 100644 --- a/src/plugins/projectexplorer/customexecutableconfigurationwidget.h +++ b/src/plugins/projectexplorer/customexecutableconfigurationwidget.h @@ -33,7 +33,7 @@ #ifndef CUSTOMEXECUTABLECONFIGURATIONWIDGET_H #define CUSTOMEXECUTABLECONFIGURATIONWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp index dfaaaf941a..21c542bcbd 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp @@ -44,13 +44,13 @@ #include <utils/qtcprocess.h> #include <utils/stringutils.h> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLabel> -#include <QtGui/QMainWindow> -#include <QtGui/QVBoxLayout> +#include <QDialog> +#include <QDialogButtonBox> +#include <QLabel> +#include <QMainWindow> +#include <QVBoxLayout> -#include <QtCore/QDir> +#include <QDir> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h index 3207f66a48..1654d5c6d0 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h @@ -37,7 +37,7 @@ #include <utils/environment.h> -#include <QtCore/QVariantMap> +#include <QVariantMap> namespace ProjectExplorer { class Target; diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index a42d21b61c..67353799fd 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -43,13 +43,13 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QMap> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> +#include <QDebug> +#include <QFile> +#include <QMap> +#include <QDir> +#include <QTextStream> +#include <QFileInfo> +#include <QCoreApplication> static const char templatePathC[] = "templates/wizards"; static const char configFileC[] = "wizard.xml"; diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h index 2af4c59beb..2385734d41 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.h +++ b/src/plugins/projectexplorer/customwizard/customwizard.h @@ -37,9 +37,9 @@ #include <coreplugin/basefilewizard.h> -#include <QtCore/QSharedPointer> -#include <QtCore/QList> -#include <QtCore/QMap> +#include <QSharedPointer> +#include <QList> +#include <QMap> QT_BEGIN_NAMESPACE class QDir; diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp index 1d350fad7a..de4911e3f1 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp @@ -36,19 +36,19 @@ #include <utils/pathchooser.h> #include <utils/qtcassert.h> -#include <QtCore/QRegExp> -#include <QtCore/QDebug> -#include <QtCore/QDir> - -#include <QtGui/QWizardPage> -#include <QtGui/QFormLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QLabel> -#include <QtGui/QRegExpValidator> -#include <QtGui/QComboBox> -#include <QtGui/QTextEdit> -#include <QtGui/QSpacerItem> +#include <QRegExp> +#include <QDebug> +#include <QDir> + +#include <QWizardPage> +#include <QFormLayout> +#include <QVBoxLayout> +#include <QLineEdit> +#include <QLabel> +#include <QRegExpValidator> +#include <QComboBox> +#include <QTextEdit> +#include <QSpacerItem> enum { debug = 0 }; diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.h b/src/plugins/projectexplorer/customwizard/customwizardpage.h index e5290f95ae..ec3d44343b 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpage.h +++ b/src/plugins/projectexplorer/customwizard/customwizardpage.h @@ -33,10 +33,10 @@ #ifndef CUSTOMPROJECTWIZARDDIALOG_H #define CUSTOMPROJECTWIZARDDIALOG_H -#include <QtGui/QComboBox> -#include <QtGui/QCheckBox> -#include <QtGui/QWizardPage> -#include <QtCore/QSharedPointer> +#include <QComboBox> +#include <QCheckBox> +#include <QWizardPage> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QFormLayout; diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp index f9795cfd12..b265b8e561 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp @@ -40,18 +40,18 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> -#include <QtCore/QLocale> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttribute> -#include <QtCore/QTemporaryFile> -#include <QtScript/QScriptEngine> - -#include <QtGui/QIcon> +#include <QDebug> +#include <QCoreApplication> +#include <QLocale> +#include <QFile> +#include <QDir> +#include <QFileInfo> +#include <QXmlStreamReader> +#include <QXmlStreamAttribute> +#include <QTemporaryFile> +#include <QScriptEngine> + +#include <QIcon> enum { debug = 0 }; diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h index 0ec2956ecc..b2476dcb85 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h @@ -35,9 +35,9 @@ #include <coreplugin/basefilewizard.h> -#include <QtCore/QStringList> -#include <QtCore/QMap> -#include <QtCore/QSharedPointer> +#include <QStringList> +#include <QMap> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp index 37031772a8..309068ede8 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp @@ -34,13 +34,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QStringList> -#include <QtCore/QStack> -#include <QtCore/QRegExp> -#include <QtCore/QDebug> +#include <QStringList> +#include <QStack> +#include <QRegExp> +#include <QDebug> -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptValue> +#include <QScriptEngine> +#include <QScriptValue> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.h b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.h index e6d6710a5b..3ce2f7b938 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.h +++ b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.h @@ -33,7 +33,7 @@ #ifndef CUSTOMWIZARDPREPROCESSOR_H #define CUSTOMWIZARDPREPROCESSOR_H -#include <QtCore/QString> +#include <QString> QT_FORWARD_DECLARE_CLASS(QScriptEngine) diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp index a5795a40a2..200b40d056 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp @@ -36,12 +36,12 @@ #include <utils/qtcassert.h> -#include <QtCore/QProcess> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QTemporaryFile> -#include <QtCore/QSharedPointer> +#include <QProcess> +#include <QDir> +#include <QFileInfo> +#include <QDebug> +#include <QTemporaryFile> +#include <QSharedPointer> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h index 52b9dadf57..a0b7b6e91a 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h +++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h @@ -33,8 +33,8 @@ #ifndef CUSTOMWIZARDSCRIPTGENERATOR_H #define CUSTOMWIZARDSCRIPTGENERATOR_H -#include <QtCore/QMap> -#include <QtCore/QStringList> +#include <QMap> +#include <QStringList> namespace Core { class GeneratedFile; diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp index 113896b67e..776d2a8d09 100644 --- a/src/plugins/projectexplorer/debugginghelper.cpp +++ b/src/plugins/projectexplorer/debugginghelper.cpp @@ -36,15 +36,15 @@ #include <utils/synchronousprocess.h> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QHash> -#include <QtCore/QProcess> -#include <QtCore/QDir> -#include <QtCore/QDateTime> -#include <QtCore/QStringList> - -#include <QtGui/QDesktopServices> +#include <QFileInfo> +#include <QCoreApplication> +#include <QHash> +#include <QProcess> +#include <QDir> +#include <QDateTime> +#include <QStringList> + +#include <QDesktopServices> using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/debugginghelper.h b/src/plugins/projectexplorer/debugginghelper.h index 4197428300..328f03f40b 100644 --- a/src/plugins/projectexplorer/debugginghelper.h +++ b/src/plugins/projectexplorer/debugginghelper.h @@ -37,7 +37,7 @@ #include <utils/buildablehelperlibrary.h> -#include <QtCore/QString> +#include <QString> QT_FORWARD_DECLARE_CLASS(QStringList) diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp index 754b5a0858..bdf8815a0e 100644 --- a/src/plugins/projectexplorer/dependenciespanel.cpp +++ b/src/plugins/projectexplorer/dependenciespanel.cpp @@ -38,22 +38,22 @@ #include <coreplugin/ifile.h> #include <utils/detailswidget.h> -#include <QtCore/QVector> -#include <QtCore/QDebug> -#include <QtCore/QSize> -#include <QtCore/QCoreApplication> - -#include <QtGui/QLabel> -#include <QtGui/QApplication> -#include <QtGui/QHBoxLayout> -#include <QtGui/QTreeView> -#include <QtGui/QSpacerItem> -#include <QtGui/QHeaderView> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> -#include <QtGui/QWidget> -#include <QtGui/QLabel> +#include <QVector> +#include <QDebug> +#include <QSize> +#include <QCoreApplication> + +#include <QLabel> +#include <QApplication> +#include <QHBoxLayout> +#include <QTreeView> +#include <QSpacerItem> +#include <QHeaderView> +#include <QMessageBox> +#include <QPushButton> +#include <QToolButton> +#include <QWidget> +#include <QLabel> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/dependenciespanel.h b/src/plugins/projectexplorer/dependenciespanel.h index 3cccd98d13..e90846006f 100644 --- a/src/plugins/projectexplorer/dependenciespanel.h +++ b/src/plugins/projectexplorer/dependenciespanel.h @@ -35,9 +35,9 @@ #include "iprojectproperties.h" -#include <QtCore/QAbstractListModel> +#include <QAbstractListModel> -#include <QtGui/QTreeView> +#include <QTreeView> namespace Utils { class DetailsWidget; diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index 9c63d45cf5..e1d67a7a43 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -39,7 +39,7 @@ #include "projectexplorerconstants.h" #include "target.h" -#include <QtCore/QStringList> +#include <QStringList> using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 372c1a1f52..cc2844a6e3 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -38,7 +38,7 @@ #include "projectconfiguration.h" #include "namedwidget.h" -#include <QtCore/QString> +#include <QString> QT_FORWARD_DECLARE_CLASS(QStringList) diff --git a/src/plugins/projectexplorer/deployconfigurationmodel.h b/src/plugins/projectexplorer/deployconfigurationmodel.h index aca50f50a5..6901d2f46c 100644 --- a/src/plugins/projectexplorer/deployconfigurationmodel.h +++ b/src/plugins/projectexplorer/deployconfigurationmodel.h @@ -33,7 +33,7 @@ #ifndef PROJECTEXPLORER_DEPLOYCONFIGURATIONMODEL_H #define PROJECTEXPLORER_DEPLOYCONFIGURATIONMODEL_H -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/doubletabwidget.cpp b/src/plugins/projectexplorer/doubletabwidget.cpp index 1b4f2a3f84..45c6e3a3a7 100644 --- a/src/plugins/projectexplorer/doubletabwidget.cpp +++ b/src/plugins/projectexplorer/doubletabwidget.cpp @@ -35,12 +35,12 @@ #include <utils/stylehelper.h> -#include <QtCore/QRect> -#include <QtGui/QPainter> -#include <QtGui/QFont> -#include <QtGui/QMouseEvent> -#include <QtGui/QMenu> -#include <QtGui/QToolTip> +#include <QRect> +#include <QPainter> +#include <QFont> +#include <QMouseEvent> +#include <QMenu> +#include <QToolTip> #include <QtDebug> diff --git a/src/plugins/projectexplorer/doubletabwidget.h b/src/plugins/projectexplorer/doubletabwidget.h index d5ce147239..087e7594c8 100644 --- a/src/plugins/projectexplorer/doubletabwidget.h +++ b/src/plugins/projectexplorer/doubletabwidget.h @@ -33,9 +33,9 @@ #ifndef DOUBLETABWIDGET_H #define DOUBLETABWIDGET_H -#include <QtCore/QVector> -#include <QtGui/QWidget> -#include <QtGui/QPixmap> +#include <QVector> +#include <QWidget> +#include <QPixmap> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index 4793ef38e4..787a73f718 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -49,10 +49,10 @@ #include <texteditor/icodestylepreferences.h> #include <texteditor/icodestylepreferencesfactory.h> -#include <QtCore/QLatin1String> -#include <QtCore/QByteArray> -#include <QtCore/QTextCodec> -#include <QtCore/QDebug> +#include <QLatin1String> +#include <QByteArray> +#include <QTextCodec> +#include <QDebug> static const QLatin1String kPrefix("EditorConfiguration."); static const QLatin1String kUseGlobal("EditorConfiguration.UseGlobal"); diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h index 34cfafdf1b..55d5501d7f 100644 --- a/src/plugins/projectexplorer/editorconfiguration.h +++ b/src/plugins/projectexplorer/editorconfiguration.h @@ -35,8 +35,8 @@ #include "projectexplorer_export.h" -#include <QtCore/QObject> -#include <QtCore/QVariantMap> +#include <QObject> +#include <QVariantMap> namespace TextEditor { class ITextEditor; diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp index ec5f9e2e2d..0d734d67cd 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp @@ -34,7 +34,7 @@ #include "editorconfiguration.h" #include "project.h" -#include <QtCore/QTextCodec> +#include <QTextCodec> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/environmentitemswidget.cpp b/src/plugins/projectexplorer/environmentitemswidget.cpp index 3ce913f0c0..e5b7bf7854 100644 --- a/src/plugins/projectexplorer/environmentitemswidget.cpp +++ b/src/plugins/projectexplorer/environmentitemswidget.cpp @@ -36,8 +36,8 @@ #include <texteditor/snippets/snippeteditor.h> #include <texteditor/texteditorsettings.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDialogButtonBox> +#include <QVBoxLayout> +#include <QDialogButtonBox> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp index e1dd5355c7..c2e5e242b9 100644 --- a/src/plugins/projectexplorer/environmentwidget.cpp +++ b/src/plugins/projectexplorer/environmentwidget.cpp @@ -37,12 +37,12 @@ #include <utils/environment.h> #include <utils/environmentmodel.h> -#include <QtCore/QString> -#include <QtGui/QHeaderView> -#include <QtGui/QPushButton> -#include <QtGui/QTableView> -#include <QtGui/QTextDocument> // for Qt::escape -#include <QtGui/QVBoxLayout> +#include <QString> +#include <QHeaderView> +#include <QPushButton> +#include <QTableView> +#include <QTextDocument> // for Qt::escape +#include <QVBoxLayout> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/environmentwidget.h b/src/plugins/projectexplorer/environmentwidget.h index 3c934fb848..f095dd1411 100644 --- a/src/plugins/projectexplorer/environmentwidget.h +++ b/src/plugins/projectexplorer/environmentwidget.h @@ -35,7 +35,7 @@ #include "projectexplorer_export.h" -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QModelIndex) diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index bb84a36b60..43fb44222d 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -50,19 +50,19 @@ #include <utils/pathchooser.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QSize> -#include <QtGui/QFileSystemModel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QToolButton> -#include <QtGui/QPushButton> -#include <QtGui/QLabel> -#include <QtGui/QListView> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QFileDialog> -#include <QtGui/QContextMenuEvent> +#include <QDebug> +#include <QSize> +#include <QFileSystemModel> +#include <QVBoxLayout> +#include <QToolButton> +#include <QPushButton> +#include <QLabel> +#include <QListView> +#include <QSortFilterProxyModel> +#include <QAction> +#include <QMenu> +#include <QFileDialog> +#include <QContextMenuEvent> enum { debug = 0 }; diff --git a/src/plugins/projectexplorer/foldernavigationwidget.h b/src/plugins/projectexplorer/foldernavigationwidget.h index 3b047ec6a9..e1920daeda 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.h +++ b/src/plugins/projectexplorer/foldernavigationwidget.h @@ -35,7 +35,7 @@ #include <coreplugin/inavigationwidgetfactory.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/projectexplorer/gccparser.h b/src/plugins/projectexplorer/gccparser.h index 62d6741487..bddd47d29c 100644 --- a/src/plugins/projectexplorer/gccparser.h +++ b/src/plugins/projectexplorer/gccparser.h @@ -35,7 +35,7 @@ #include "ioutputparser.h" -#include <QtCore/QRegExp> +#include <QRegExp> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index be7ff90b94..506b5eb22b 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -43,15 +43,15 @@ #include <utils/qtcassert.h> #include <utils/pathchooser.h> -#include <QtCore/QBuffer> -#include <QtCore/QCoreApplication> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtCore/QScopedPointer> +#include <QBuffer> +#include <QCoreApplication> +#include <QFileInfo> +#include <QProcess> +#include <QScopedPointer> -#include <QtGui/QComboBox> -#include <QtGui/QFormLayout> -#include <QtGui/QLabel> +#include <QComboBox> +#include <QFormLayout> +#include <QLabel> namespace ProjectExplorer { @@ -1065,7 +1065,7 @@ GccToolChain *Internal::LinuxIccToolChainFactory::createToolChain(bool autoDetec # include "projectexplorer.h" # include <QTest> -# include <QtCore/QUrl> +# include <QUrl> namespace ProjectExplorer { void ProjectExplorerPlugin::testGccAbiGuessing_data() diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h index a8bcc80bff..aab545de74 100644 --- a/src/plugins/projectexplorer/gcctoolchainfactories.h +++ b/src/plugins/projectexplorer/gcctoolchainfactories.h @@ -38,7 +38,7 @@ #include "abi.h" #include "abiwidget.h" -#include <QtCore/QList> +#include <QList> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index fab1822c4c..63634cd5b9 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -35,8 +35,8 @@ #include "projectexplorerconstants.h" #include "task.h" -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QDir> +#include <QFile> using namespace ProjectExplorer; @@ -172,7 +172,7 @@ QStringList GnuMakeParser::searchDirectories() const #ifdef WITH_TESTS # include <QTest> -# include <QtCore/QUuid> +# include <QUuid> # include "outputparser_test.h" # include "projectexplorer.h" diff --git a/src/plugins/projectexplorer/gnumakeparser.h b/src/plugins/projectexplorer/gnumakeparser.h index 17b728706d..ee6bba8584 100644 --- a/src/plugins/projectexplorer/gnumakeparser.h +++ b/src/plugins/projectexplorer/gnumakeparser.h @@ -35,8 +35,8 @@ #include "ioutputparser.h" -#include <QtCore/QRegExp> -#include <QtCore/QStringList> +#include <QRegExp> +#include <QStringList> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/headerpath.h b/src/plugins/projectexplorer/headerpath.h index c659409152..9208eee293 100644 --- a/src/plugins/projectexplorer/headerpath.h +++ b/src/plugins/projectexplorer/headerpath.h @@ -33,7 +33,7 @@ #ifndef HEADERPATH_H #define HEADERPATH_H -#include <QtCore/QString> +#include <QString> #include "projectexplorer_export.h" diff --git a/src/plugins/projectexplorer/ioutputparser.h b/src/plugins/projectexplorer/ioutputparser.h index 9f042c35e4..23fe441e03 100644 --- a/src/plugins/projectexplorer/ioutputparser.h +++ b/src/plugins/projectexplorer/ioutputparser.h @@ -36,7 +36,7 @@ #include "projectexplorer_export.h" #include "buildstep.h" -#include <QtCore/QString> +#include <QString> namespace ProjectExplorer { class Task; diff --git a/src/plugins/projectexplorer/iprojectmanager.h b/src/plugins/projectexplorer/iprojectmanager.h index 7777dd1b7e..b824212423 100644 --- a/src/plugins/projectexplorer/iprojectmanager.h +++ b/src/plugins/projectexplorer/iprojectmanager.h @@ -35,7 +35,7 @@ #include "projectexplorer_export.h" -#include <QtCore/QObject> +#include <QObject> namespace Core { class Context; diff --git a/src/plugins/projectexplorer/iprojectproperties.h b/src/plugins/projectexplorer/iprojectproperties.h index d78f630551..110b4f9a53 100644 --- a/src/plugins/projectexplorer/iprojectproperties.h +++ b/src/plugins/projectexplorer/iprojectproperties.h @@ -35,9 +35,9 @@ #include "projectexplorer_export.h" -#include <QtCore/QObject> -#include <QtGui/QIcon> -#include <QtGui/QWidget> +#include <QObject> +#include <QIcon> +#include <QWidget> namespace ProjectExplorer { class Project; diff --git a/src/plugins/projectexplorer/itaskhandler.h b/src/plugins/projectexplorer/itaskhandler.h index 444314d18b..a43dd7e7a5 100644 --- a/src/plugins/projectexplorer/itaskhandler.h +++ b/src/plugins/projectexplorer/itaskhandler.h @@ -35,8 +35,8 @@ #include "projectexplorer_export.h" -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/projectexplorer/ldparser.h b/src/plugins/projectexplorer/ldparser.h index f7320804c0..2d4aefe47c 100644 --- a/src/plugins/projectexplorer/ldparser.h +++ b/src/plugins/projectexplorer/ldparser.h @@ -35,7 +35,7 @@ #include "ioutputparser.h" -#include <QtCore/QRegExp> +#include <QRegExp> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/linuxiccparser.h b/src/plugins/projectexplorer/linuxiccparser.h index bf2fc7447d..53e4d4e32a 100644 --- a/src/plugins/projectexplorer/linuxiccparser.h +++ b/src/plugins/projectexplorer/linuxiccparser.h @@ -36,7 +36,7 @@ #include "ioutputparser.h" #include "task.h" -#include <QtCore/QRegExp> +#include <QRegExp> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp index ab7e8c8ab5..87c89f631c 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp +++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp @@ -38,9 +38,9 @@ #include <utils/qtcassert.h> #include <utils/environment.h> -#include <QtGui/QLabel> -#include <QtGui/QIcon> -#include <QtCore/QDir> +#include <QLabel> +#include <QIcon> +#include <QDir> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/metatypedeclarations.h b/src/plugins/projectexplorer/metatypedeclarations.h index ef9dfa9cbb..1ff45e77a6 100644 --- a/src/plugins/projectexplorer/metatypedeclarations.h +++ b/src/plugins/projectexplorer/metatypedeclarations.h @@ -33,7 +33,7 @@ #ifndef PROJECTEXPLORERMETATYPEDECLARATIONS_H #define PROJECTEXPLORERMETATYPEDECLARATIONS_H -#include <QtCore/QMetaType> +#include <QMetaType> namespace ProjectExplorer { class IProjectManager; diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 62830933bc..4115bdefda 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -49,17 +49,17 @@ #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/runconfiguration.h> -#include <QtCore/QTimer> -#include <QtGui/QLayout> -#include <QtGui/QLabel> -#include <QtGui/QListWidget> -#include <QtGui/QStatusBar> -#include <QtGui/QKeyEvent> -#include <QtGui/QPainter> -#include <QtGui/QAction> -#include <QtGui/QItemDelegate> -#include <QtGui/QMainWindow> -#include <QtGui/QApplication> +#include <QTimer> +#include <QLayout> +#include <QLabel> +#include <QListWidget> +#include <QStatusBar> +#include <QKeyEvent> +#include <QPainter> +#include <QAction> +#include <QItemDelegate> +#include <QMainWindow> +#include <QApplication> static QIcon createCenteredIcon(const QIcon &icon, const QIcon &overlay) { diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.h b/src/plugins/projectexplorer/miniprojecttargetselector.h index b370ed4abe..9ce759e9e5 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.h +++ b/src/plugins/projectexplorer/miniprojecttargetselector.h @@ -33,8 +33,8 @@ #ifndef MINIPROJECTTARGETSELECTOR_H #define MINIPROJECTTARGETSELECTOR_H -#include <QtGui/QListWidget> -#include <QtCore/QDateTime> +#include <QListWidget> +#include <QDateTime> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/projectexplorer/msvcparser.h b/src/plugins/projectexplorer/msvcparser.h index f1f2346677..f4a5927405 100644 --- a/src/plugins/projectexplorer/msvcparser.h +++ b/src/plugins/projectexplorer/msvcparser.h @@ -36,8 +36,8 @@ #include "ioutputparser.h" #include "task.h" -#include <QtCore/QRegExp> -#include <QtCore/QString> +#include <QRegExp> +#include <QString> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 460adef00f..e55cbf25f8 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -44,12 +44,12 @@ #include <utils/winutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QProcess> -#include <QtCore/QSettings> -#include <QtCore/QUrl> -#include <QtGui/QFormLayout> -#include <QtGui/QDesktopServices> +#include <QDir> +#include <QProcess> +#include <QSettings> +#include <QUrl> +#include <QFormLayout> +#include <QDesktopServices> #define KEY_ROOT "ProjectExplorer.MsvcToolChain." static const char debuggerCommandKeyC[] = KEY_ROOT"Debugger"; diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 0da1da3cea..9f8d20d86a 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -39,7 +39,7 @@ #include <utils/environment.h> -#include <QtGui/QLabel> +#include <QLabel> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/namedwidget.h b/src/plugins/projectexplorer/namedwidget.h index 41c66c1476..e59b04ac11 100644 --- a/src/plugins/projectexplorer/namedwidget.h +++ b/src/plugins/projectexplorer/namedwidget.h @@ -35,7 +35,7 @@ #include "projectexplorer_export.h" -#include <QtGui/QWidget> +#include <QWidget> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/nodesvisitor.h b/src/plugins/projectexplorer/nodesvisitor.h index bc1156ec80..e9fec8dbaf 100644 --- a/src/plugins/projectexplorer/nodesvisitor.h +++ b/src/plugins/projectexplorer/nodesvisitor.h @@ -35,7 +35,7 @@ #include "projectexplorer_export.h" -#include <QtCore/QStringList> +#include <QStringList> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/pluginfilefactory.cpp b/src/plugins/projectexplorer/pluginfilefactory.cpp index f5368ff0fa..4f18e32109 100644 --- a/src/plugins/projectexplorer/pluginfilefactory.cpp +++ b/src/plugins/projectexplorer/pluginfilefactory.cpp @@ -43,7 +43,7 @@ #include <coreplugin/mimedatabase.h> #include <coreplugin/messagemanager.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/pluginfilefactory.h b/src/plugins/projectexplorer/pluginfilefactory.h index e79dc1a0e4..85b27e4615 100644 --- a/src/plugins/projectexplorer/pluginfilefactory.h +++ b/src/plugins/projectexplorer/pluginfilefactory.h @@ -35,7 +35,7 @@ #include <coreplugin/ifilefactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/processparameters.cpp b/src/plugins/projectexplorer/processparameters.cpp index cba0782682..8ab9a9f6ed 100644 --- a/src/plugins/projectexplorer/processparameters.cpp +++ b/src/plugins/projectexplorer/processparameters.cpp @@ -35,8 +35,8 @@ #include <utils/stringutils.h> #include <utils/qtcprocess.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> +#include <QFileInfo> +#include <QDir> /*! \class ProjectExplorer::ProcessParameters diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index ac350c13eb..8b9e6eaf24 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -41,8 +41,8 @@ #include <utils/qtcprocess.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtGui/QFileDialog> +#include <QDebug> +#include <QFileDialog> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index 7e5b977b54..d050b90939 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -35,9 +35,9 @@ #include "projectexplorer_export.h" -#include <QtCore/QObject> -#include <QtCore/QSet> -#include <QtGui/QFileSystemModel> +#include <QObject> +#include <QSet> +#include <QFileSystemModel> namespace Core { class IFile; diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index ca6276b3cb..5f44bda1f1 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -35,9 +35,9 @@ #include "projectexplorer_export.h" -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QVariantMap> +#include <QObject> +#include <QString> +#include <QVariantMap> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index cc6493560b..ad2b1dfa9f 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -115,19 +115,19 @@ #include <utils/stringutils.h> #include <utils/persistentsettings.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QAbstractFileEngine> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QFileDialog> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QWizard> +#include <QtPlugin> +#include <QDateTime> +#include <QDebug> +#include <QSettings> +#include <QAbstractFileEngine> + +#include <QAction> +#include <QApplication> +#include <QFileDialog> +#include <QMenu> +#include <QMessageBox> +#include <QMainWindow> +#include <QWizard> /*! \namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h index 6df75b89fb..49145de8f2 100644 --- a/src/plugins/projectexplorer/projectexplorer.h +++ b/src/plugins/projectexplorer/projectexplorer.h @@ -38,7 +38,7 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QPair> +#include <QPair> QT_BEGIN_NAMESPACE class QPoint; diff --git a/src/plugins/projectexplorer/projectexplorer_export.h b/src/plugins/projectexplorer/projectexplorer_export.h index 4fc285a7e1..8952f020e0 100644 --- a/src/plugins/projectexplorer/projectexplorer_export.h +++ b/src/plugins/projectexplorer/projectexplorer_export.h @@ -33,7 +33,7 @@ #ifndef PROJECTEXPLORER_EXPORT_H #define PROJECTEXPLORER_EXPORT_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(PROJECTEXPLORER_LIBRARY) # define PROJECTEXPLORER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 506bf5ddc4..3d1be9a915 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -33,7 +33,7 @@ #ifndef PROJECTEXPLORERCONSTANTS_H #define PROJECTEXPLORERCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace ProjectExplorer { namespace Constants { diff --git a/src/plugins/projectexplorer/projectexplorersettings.h b/src/plugins/projectexplorer/projectexplorersettings.h index 4d697de153..150fd93607 100644 --- a/src/plugins/projectexplorer/projectexplorersettings.h +++ b/src/plugins/projectexplorer/projectexplorersettings.h @@ -33,7 +33,7 @@ #ifndef PROJECTEXPLORERSETTINGS_H #define PROJECTEXPLORERSETTINGS_H -#include <QtCore/QUuid> +#include <QUuid> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 69a15332d9..44398ff877 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -38,8 +38,8 @@ #include <coreplugin/icore.h> #include <coreplugin/filemanager.h> -#include <QtGui/QLabel> -#include <QtCore/QCoreApplication> +#include <QLabel> +#include <QCoreApplication> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.h b/src/plugins/projectexplorer/projectexplorersettingspage.h index 72696a28fc..d8d9277804 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.h +++ b/src/plugins/projectexplorer/projectexplorersettingspage.h @@ -36,7 +36,7 @@ #include <coreplugin/dialogs/ioptionspage.h> #include "ui_projectexplorersettingspage.h" -#include <QtCore/QPointer> +#include <QPointer> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index 5394b78c94..2ace305d96 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -56,14 +56,14 @@ #include <projectexplorer/project.h> #include <projectexplorer/editorconfiguration.h> -#include <QtCore/QVariant> -#include <QtCore/QtAlgorithms> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QMultiMap> -#include <QtCore/QDir> -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> +#include <QVariant> +#include <QtAlgorithms> +#include <QDebug> +#include <QFileInfo> +#include <QMultiMap> +#include <QDir> +#include <QTextDocument> +#include <QTextCursor> /*! \class ProjectExplorer::Internal::ProjectFileWizardExtension diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 9b0a961371..f7d2b64b93 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -40,11 +40,11 @@ #include <coreplugin/fileiconprovider.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> -#include <QtGui/QFont> -#include <QtGui/QIcon> +#include <QFont> +#include <QIcon> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/projectmodels.h b/src/plugins/projectexplorer/projectmodels.h index b52b1d598f..24bf4f6deb 100644 --- a/src/plugins/projectexplorer/projectmodels.h +++ b/src/plugins/projectexplorer/projectmodels.h @@ -33,8 +33,8 @@ #ifndef PROJECTMODELS_H #define PROJECTMODELS_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QSet> +#include <QAbstractItemModel> +#include <QSet> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index ee7b90aff2..cc902ebb89 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -39,11 +39,11 @@ #include <coreplugin/fileiconprovider.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QApplication> -#include <QtGui/QIcon> -#include <QtGui/QStyle> +#include <QFileInfo> +#include <QDir> +#include <QApplication> +#include <QIcon> +#include <QStyle> using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 81f02fba5b..ece062f994 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -35,10 +35,10 @@ #include "projectexplorer_export.h" -#include <QtGui/QIcon> +#include <QIcon> -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> QT_BEGIN_NAMESPACE class QFileInfo; diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index 67550772eb..502fa22503 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -47,17 +47,17 @@ #include <utils/qtcassert.h> #include <utils/navigationtreeview.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> - -#include <QtGui/QHeaderView> -#include <QtGui/QTreeView> -#include <QtGui/QVBoxLayout> -#include <QtGui/QToolButton> -#include <QtGui/QFocusEvent> -#include <QtGui/QAction> -#include <QtGui/QPalette> -#include <QtGui/QMenu> +#include <QDebug> +#include <QSettings> + +#include <QHeaderView> +#include <QTreeView> +#include <QVBoxLayout> +#include <QToolButton> +#include <QFocusEvent> +#include <QAction> +#include <QPalette> +#include <QMenu> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/projecttreewidget.h b/src/plugins/projectexplorer/projecttreewidget.h index ce9b21a086..0c2867be53 100644 --- a/src/plugins/projectexplorer/projecttreewidget.h +++ b/src/plugins/projectexplorer/projecttreewidget.h @@ -35,8 +35,8 @@ #include <coreplugin/inavigationwidgetfactory.h> -#include <QtGui/QWidget> -#include <QtCore/QModelIndex> +#include <QWidget> +#include <QModelIndex> QT_FORWARD_DECLARE_CLASS(QTreeView) diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index 7dffb2fdd8..c5f933514a 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -34,8 +34,8 @@ #include <utils/stringutils.h> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeContext> +#include <QDeclarativeEngine> +#include <QDeclarativeContext> #include <projectexplorer/session.h> #include <projectexplorer/projectexplorer.h> diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h index 07df0ce606..133796320c 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.h +++ b/src/plugins/projectexplorer/projectwelcomepage.h @@ -33,8 +33,8 @@ #ifndef PROJECTWELCOMEPAGE_H #define PROJECTWELCOMEPAGE_H -#include <QtCore/QAbstractListModel> -#include <QtCore/QStringList> +#include <QAbstractListModel> +#include <QStringList> #include <utils/iwelcomepage.h> #include <coreplugin/icore.h> diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 27de1b970e..ee6e683f65 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -49,11 +49,11 @@ #include <utils/qtcassert.h> #include <utils/stylehelper.h> -#include <QtGui/QApplication> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QPainter> -#include <QtGui/QStackedWidget> +#include <QApplication> +#include <QGridLayout> +#include <QLabel> +#include <QPainter> +#include <QStackedWidget> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h index 1cf711e87e..c4f372a09e 100644 --- a/src/plugins/projectexplorer/projectwindow.h +++ b/src/plugins/projectexplorer/projectwindow.h @@ -33,8 +33,8 @@ #ifndef PROJECTWINDOW_H #define PROJECTWINDOW_H -#include <QtCore/QMap> -#include <QtGui/QScrollArea> +#include <QMap> +#include <QScrollArea> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp index 89fe23e51a..846d732b81 100644 --- a/src/plugins/projectexplorer/projectwizardpage.cpp +++ b/src/plugins/projectexplorer/projectwizardpage.cpp @@ -36,8 +36,8 @@ #include <coreplugin/icore.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QDir> -#include <QtCore/QTextStream> +#include <QDir> +#include <QTextStream> /*! \class ProjectExplorer::Internal::ProjectWizardPage diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h index 603ef50ea5..d466d3b0be 100644 --- a/src/plugins/projectexplorer/projectwizardpage.h +++ b/src/plugins/projectexplorer/projectwizardpage.h @@ -33,7 +33,7 @@ #ifndef PROJECTWIZARDPAGE_H #define PROJECTWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/publishing/ipublishingwizardfactory.h b/src/plugins/projectexplorer/publishing/ipublishingwizardfactory.h index 5f64c066e4..0265a2c0da 100644 --- a/src/plugins/projectexplorer/publishing/ipublishingwizardfactory.h +++ b/src/plugins/projectexplorer/publishing/ipublishingwizardfactory.h @@ -36,8 +36,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QList> -#include <QtGui/QWizard> +#include <QList> +#include <QWizard> namespace ProjectExplorer { class Project; diff --git a/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp b/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp index 472d3763ba..2e2b4d010b 100644 --- a/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp +++ b/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp @@ -38,7 +38,7 @@ #include <projectexplorer/project.h> #include <utils/qtcassert.h> -#include <QtGui/QPushButton> +#include <QPushButton> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.h b/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.h index b903b0f7f7..6ec4fa970a 100644 --- a/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.h +++ b/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.h @@ -32,8 +32,8 @@ #ifndef PUBLISHINGWIZARDSELECTIONDIALOG_H #define PUBLISHINGWIZARDSELECTIONDIALOG_H -#include <QtCore/QList> -#include <QtGui/QDialog> +#include <QList> +#include <QDialog> QT_FORWARD_DECLARE_CLASS(QWizard) diff --git a/src/plugins/projectexplorer/removefiledialog.cpp b/src/plugins/projectexplorer/removefiledialog.cpp index 6350fa6841..7de35d3f75 100644 --- a/src/plugins/projectexplorer/removefiledialog.cpp +++ b/src/plugins/projectexplorer/removefiledialog.cpp @@ -33,7 +33,7 @@ #include "removefiledialog.h" #include "ui_removefiledialog.h" -#include <QtCore/QDir> +#include <QDir> using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/removefiledialog.h b/src/plugins/projectexplorer/removefiledialog.h index 8b77fd6027..461ce9da97 100644 --- a/src/plugins/projectexplorer/removefiledialog.h +++ b/src/plugins/projectexplorer/removefiledialog.h @@ -33,7 +33,7 @@ #ifndef REMOVEFILEDIALOG_H #define REMOVEFILEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index a229ca6f3b..05e631c9bd 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -46,11 +46,11 @@ #include <coreplugin/icore.h> -#include <QtCore/QTimer> -#include <QtCore/QSettings> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QTimer> +#include <QSettings> +#include <QMainWindow> +#include <QMessageBox> +#include <QPushButton> #ifdef Q_OS_MAC #include <Carbon/Carbon.h> diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index bf88893f78..62b4a96d33 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -39,9 +39,9 @@ #include <utils/outputformat.h> -#include <QtCore/QMetaType> -#include <QtCore/QWeakPointer> -#include <QtGui/QWidget> +#include <QMetaType> +#include <QWeakPointer> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QIcon) diff --git a/src/plugins/projectexplorer/runconfigurationmodel.h b/src/plugins/projectexplorer/runconfigurationmodel.h index e118222798..28fb12ab13 100644 --- a/src/plugins/projectexplorer/runconfigurationmodel.h +++ b/src/plugins/projectexplorer/runconfigurationmodel.h @@ -33,7 +33,7 @@ #ifndef RUNCONFIGURATIONMODEL_H #define RUNCONFIGURATIONMODEL_H -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace ProjectExplorer { class Target; diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index de5ae10b7e..e550c68a33 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -46,20 +46,20 @@ #include <projectexplorer/buildmanager.h> #include <utils/qtcassert.h> -#include <QtCore/QPair> -#include <QtCore/QVariant> -#include <QtGui/QAction> -#include <QtGui/QButtonGroup> -#include <QtGui/QComboBox> -#include <QtGui/QGridLayout> -#include <QtGui/QHeaderView> -#include <QtGui/QInputDialog> -#include <QtGui/QLabel> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QSpacerItem> -#include <QtGui/QWidget> +#include <QPair> +#include <QVariant> +#include <QAction> +#include <QButtonGroup> +#include <QComboBox> +#include <QGridLayout> +#include <QHeaderView> +#include <QInputDialog> +#include <QLabel> +#include <QMenu> +#include <QMessageBox> +#include <QPushButton> +#include <QSpacerItem> +#include <QWidget> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h index aa897947d0..636a41f883 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.h +++ b/src/plugins/projectexplorer/runsettingspropertiespage.h @@ -35,8 +35,8 @@ #include "iprojectproperties.h" -#include <QtGui/QWidget> -#include <QtGui/QIcon> +#include <QWidget> +#include <QIcon> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 4af16ce95d..baa1613fd7 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -53,18 +53,18 @@ #include <utils/listutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QFuture> -#include <QtCore/QSettings> -#include <QtCore/QTimer> - -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtCore/QTextCodec> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QFuture> +#include <QSettings> +#include <QTimer> + +#include <QApplication> +#include <QMainWindow> +#include <QMessageBox> +#include <QPushButton> +#include <QTextCodec> namespace { bool debug = false; diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h index f85e496ea1..6f555f5ed6 100644 --- a/src/plugins/projectexplorer/session.h +++ b/src/plugins/projectexplorer/session.h @@ -37,11 +37,11 @@ #include <utils/persistentsettings.h> -#include <QtCore/QHash> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QMap> -#include <QtCore/QFutureInterface> +#include <QHash> +#include <QString> +#include <QStringList> +#include <QMap> +#include <QFutureInterface> QT_BEGIN_NAMESPACE class QAbstractItemModel; diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp index 7aed4acd01..7598be59c2 100644 --- a/src/plugins/projectexplorer/sessiondialog.cpp +++ b/src/plugins/projectexplorer/sessiondialog.cpp @@ -33,8 +33,8 @@ #include "sessiondialog.h" #include "session.h" -#include <QtGui/QInputDialog> -#include <QtGui/QValidator> +#include <QInputDialog> +#include <QValidator> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/sessiondialog.h b/src/plugins/projectexplorer/sessiondialog.h index 508a277664..fc181856e4 100644 --- a/src/plugins/projectexplorer/sessiondialog.h +++ b/src/plugins/projectexplorer/sessiondialog.h @@ -33,8 +33,8 @@ #ifndef SESSIONDIALOG_H #define SESSIONDIALOG_H -#include <QtCore/QString> -#include <QtGui/QDialog> +#include <QString> +#include <QDialog> #include "ui_sessiondialog.h" diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index d65e82b40e..2b099643b1 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -45,10 +45,10 @@ #include <utils/qtcprocess.h> #include <utils/persistentsettings.h> -#include <QtCore/QFile> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> +#include <QFile> +#include <QApplication> +#include <QMainWindow> +#include <QMessageBox> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h index aaf9e02c0b..d047efb06b 100644 --- a/src/plugins/projectexplorer/settingsaccessor.h +++ b/src/plugins/projectexplorer/settingsaccessor.h @@ -33,7 +33,7 @@ #ifndef PROJECTMANAGER_USERFILEACCESSOR_H #define PROJECTMANAGER_USERFILEACCESSOR_H -#include <QtCore/QVariantMap> +#include <QVariantMap> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/showineditortaskhandler.cpp b/src/plugins/projectexplorer/showineditortaskhandler.cpp index 7b26017125..00aaa2697b 100644 --- a/src/plugins/projectexplorer/showineditortaskhandler.cpp +++ b/src/plugins/projectexplorer/showineditortaskhandler.cpp @@ -37,8 +37,8 @@ #include <texteditor/basetexteditor.h> -#include <QtGui/QAction> -#include <QtCore/QFileInfo> +#include <QAction> +#include <QFileInfo> using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/showoutputtaskhandler.cpp b/src/plugins/projectexplorer/showoutputtaskhandler.cpp index 2e6e336a0a..5e7da53233 100644 --- a/src/plugins/projectexplorer/showoutputtaskhandler.cpp +++ b/src/plugins/projectexplorer/showoutputtaskhandler.cpp @@ -37,7 +37,7 @@ #include "compileoutputwindow.h" -#include <QtGui/QAction> +#include <QAction> using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index cd596dee75..d258a17e2f 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -46,7 +46,7 @@ #include <projectexplorer/projectexplorer.h> #include <utils/qtcassert.h> -#include <QtGui/QIcon> +#include <QIcon> namespace { const char ACTIVE_BC_KEY[] = "ProjectExplorer.Target.ActiveBuildConfiguration"; diff --git a/src/plugins/projectexplorer/targetselector.cpp b/src/plugins/projectexplorer/targetselector.cpp index ccc375fdff..707160377d 100644 --- a/src/plugins/projectexplorer/targetselector.cpp +++ b/src/plugins/projectexplorer/targetselector.cpp @@ -35,10 +35,10 @@ #include <utils/qtcassert.h> #include <utils/stylehelper.h> -#include <QtGui/QPainter> -#include <QtGui/QMenu> -#include <QtGui/QMouseEvent> -#include <QtGui/QFontMetrics> +#include <QPainter> +#include <QMenu> +#include <QMouseEvent> +#include <QFontMetrics> static const int TARGET_HEIGHT = 43; static const int ADDBUTTON_WIDTH = 27; diff --git a/src/plugins/projectexplorer/targetselector.h b/src/plugins/projectexplorer/targetselector.h index 1f3d7fe335..6aaadf849b 100644 --- a/src/plugins/projectexplorer/targetselector.h +++ b/src/plugins/projectexplorer/targetselector.h @@ -33,8 +33,8 @@ #ifndef TARGETSELECTOR_H #define TARGETSELECTOR_H -#include <QtGui/QWidget> -#include <QtGui/QPixmap> +#include <QWidget> +#include <QPixmap> QT_BEGIN_NAMESPACE class QMenu; diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp index 88a92bf70a..dbd6135635 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.cpp +++ b/src/plugins/projectexplorer/targetsettingspanel.cpp @@ -43,13 +43,13 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/buildmanager.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QLabel> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QVBoxLayout> -#include <QtGui/QStackedWidget> -#include <QtGui/QPushButton> +#include <QCoreApplication> +#include <QLabel> +#include <QMenu> +#include <QMessageBox> +#include <QVBoxLayout> +#include <QStackedWidget> +#include <QPushButton> using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/targetsettingspanel.h b/src/plugins/projectexplorer/targetsettingspanel.h index 924313c4f0..d95c358d1b 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.h +++ b/src/plugins/projectexplorer/targetsettingspanel.h @@ -33,7 +33,7 @@ #ifndef TARGETSETTINGSPANEL_H #define TARGETSETTINGSPANEL_H -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp index ac81511ab1..2fed11a6a5 100644 --- a/src/plugins/projectexplorer/task.cpp +++ b/src/plugins/projectexplorer/task.cpp @@ -32,7 +32,7 @@ #include "task.h" -#include <QtCore/QDir> +#include <QDir> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index c5e3779277..c1f8168c14 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -39,9 +39,9 @@ #include <texteditor/basetextmark.h> #include <utils/fileutils.h> -#include <QtCore/QMetaType> +#include <QMetaType> -#include <QtGui/QTextLayout> +#include <QTextLayout> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index 29453d10f7..6d1d73edfb 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -34,7 +34,7 @@ #include "extensionsystem/pluginmanager.h" #include "projectexplorer.h" #include <texteditor/basetextmark.h> -#include <QtCore/QMetaType> +#include <QMetaType> using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/taskhub.h b/src/plugins/projectexplorer/taskhub.h index 73c437970a..8dd962eafb 100644 --- a/src/plugins/projectexplorer/taskhub.h +++ b/src/plugins/projectexplorer/taskhub.h @@ -35,8 +35,8 @@ #include "task.h" -#include <QtCore/QObject> -#include <QtGui/QIcon> +#include <QObject> +#include <QIcon> namespace ProjectExplorer { class Task; diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp index fd840877d8..36e80c3291 100644 --- a/src/plugins/projectexplorer/taskmodel.cpp +++ b/src/plugins/projectexplorer/taskmodel.cpp @@ -37,7 +37,7 @@ #include <utils/qtcassert.h> -#include <QtGui/QFontMetrics> +#include <QFontMetrics> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/taskmodel.h b/src/plugins/projectexplorer/taskmodel.h index 0a378579f2..ae8a6dc0ce 100644 --- a/src/plugins/projectexplorer/taskmodel.h +++ b/src/plugins/projectexplorer/taskmodel.h @@ -30,9 +30,9 @@ ** **************************************************************************/ -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> -#include <QtGui/QIcon> +#include <QIcon> #include "task.h" diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 56b7412b71..4f0a93bebf 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -46,17 +46,17 @@ #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QKeyEvent> -#include <QtGui/QListView> -#include <QtGui/QPainter> -#include <QtGui/QStyledItemDelegate> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QMenu> -#include <QtGui/QToolButton> +#include <QDir> +#include <QFileInfo> +#include <QApplication> +#include <QClipboard> +#include <QKeyEvent> +#include <QListView> +#include <QPainter> +#include <QStyledItemDelegate> +#include <QSortFilterProxyModel> +#include <QMenu> +#include <QToolButton> namespace { const int ELLIPSIS_GRADIENT_WIDTH = 16; diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 4adcb60a1c..39dfda865a 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -37,8 +37,8 @@ #include <extensionsystem/pluginmanager.h> #include <utils/environment.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QUuid> +#include <QCoreApplication> +#include <QUuid> static const char ID_KEY[] = "ProjectExplorer.ToolChain.Id"; static const char DISPLAY_NAME_KEY[] = "ProjectExplorer.ToolChain.DisplayName"; diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 750ad118a1..b1df8d4362 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -38,9 +38,9 @@ #include <utils/fileutils.h> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QVariantMap> +#include <QObject> +#include <QString> +#include <QVariantMap> namespace Utils { class Environment; diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp index c001489257..9a3ee94a97 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp +++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp @@ -36,13 +36,13 @@ #include <utils/qtcassert.h> #include <utils/pathchooser.h> -#include <QtCore/QString> +#include <QString> -#include <QtGui/QFormLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> +#include <QFormLayout> +#include <QGridLayout> +#include <QLineEdit> +#include <QLabel> +#include <QPushButton> namespace { diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.h b/src/plugins/projectexplorer/toolchainconfigwidget.h index 118dc7d1aa..7b194ba233 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.h +++ b/src/plugins/projectexplorer/toolchainconfigwidget.h @@ -37,7 +37,7 @@ #include <utils/fileutils.h> -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QFormLayout) QT_FORWARD_DECLARE_CLASS(QGridLayout) diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index da53306bbd..c89ae570fa 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -40,10 +40,10 @@ #include <utils/persistentsettings.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QSettings> -#include <QtGui/QMainWindow> +#include <QCoreApplication> +#include <QDir> +#include <QSettings> +#include <QMainWindow> static const char TOOLCHAIN_DATA_KEY[] = "ToolChain."; static const char TOOLCHAIN_COUNT_KEY[] = "ToolChain.Count"; diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h index 3fd3e351d4..5eec8625e4 100644 --- a/src/plugins/projectexplorer/toolchainmanager.h +++ b/src/plugins/projectexplorer/toolchainmanager.h @@ -37,9 +37,9 @@ #include <utils/fileutils.h> -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QList> +#include <QObject> +#include <QString> namespace ProjectExplorer { class ProjectExplorerPlugin; diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 29f2d627dc..26d9dd26a4 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -42,13 +42,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QSignalMapper> -#include <QtCore/QTextStream> -#include <QtGui/QAction> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QLabel> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QSignalMapper> +#include <QTextStream> +#include <QAction> +#include <QItemSelectionModel> +#include <QLabel> +#include <QMenu> +#include <QMessageBox> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/toolchainoptionspage.h b/src/plugins/projectexplorer/toolchainoptionspage.h index 54e9bfb5f9..d0cb0eee20 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.h +++ b/src/plugins/projectexplorer/toolchainoptionspage.h @@ -37,7 +37,7 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> QT_BEGIN_NAMESPACE class QTreeWidgetItem; diff --git a/src/plugins/projectexplorer/vcsannotatetaskhandler.cpp b/src/plugins/projectexplorer/vcsannotatetaskhandler.cpp index 70d1b218d8..2f5ea94858 100644 --- a/src/plugins/projectexplorer/vcsannotatetaskhandler.cpp +++ b/src/plugins/projectexplorer/vcsannotatetaskhandler.cpp @@ -39,9 +39,9 @@ #include <coreplugin/iversioncontrol.h> #include <coreplugin/vcsmanager.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> -#include <QtGui/QAction> +#include <QAction> using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/wincetoolchain.cpp b/src/plugins/projectexplorer/wincetoolchain.cpp index 2068b1e89f..8108746528 100644 --- a/src/plugins/projectexplorer/wincetoolchain.cpp +++ b/src/plugins/projectexplorer/wincetoolchain.cpp @@ -40,12 +40,12 @@ #include <projectexplorer/projectexplorersettings.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> +#include <QDir> +#include <QFileInfo> +#include <QSettings> -#include <QtGui/QFormLayout> -#include <QtGui/QLabel> +#include <QFormLayout> +#include <QLabel> #include <QXmlStreamReader> diff --git a/src/plugins/projectexplorer/wincetoolchain.h b/src/plugins/projectexplorer/wincetoolchain.h index a536c911e5..f09a1ded26 100644 --- a/src/plugins/projectexplorer/wincetoolchain.h +++ b/src/plugins/projectexplorer/wincetoolchain.h @@ -39,7 +39,7 @@ #include <utils/environment.h> -#include <QtGui/QLabel> +#include <QLabel> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/windebuginterface.h b/src/plugins/projectexplorer/windebuginterface.h index 19a4f59a39..f937ac9c7a 100644 --- a/src/plugins/projectexplorer/windebuginterface.h +++ b/src/plugins/projectexplorer/windebuginterface.h @@ -33,7 +33,7 @@ #ifndef WINDEBUGINTERFACE_H #define WINDEBUGINTERFACE_H -#include <QtCore/QThread> +#include <QThread> namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp index 9f784e5cd0..bb91a2f34b 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp @@ -34,7 +34,7 @@ #include "formeditorview.h" #include <modelnode.h> -#include <QtCore/QDebug> +#include <QDebug> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp index 15f4d5395a..d70b8108ae 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp @@ -65,27 +65,27 @@ #include <utils/fileutils.h> #include <utils/crumblepath.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QUrl> -#include <QtCore/QProcess> -#include <QtCore/QTemporaryFile> -#include <QtCore/QtDebug> -#include <QtCore/QEvent> - -#include <QtGui/QBoxLayout> -#include <QtGui/QComboBox> -#include <QtGui/QErrorMessage> -#include <QtGui/QFileDialog> -#include <QtGui/QLabel> -#include <QtGui/QMdiArea> -#include <QtGui/QMdiSubWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QUndoStack> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QApplication> +#include <QCoreApplication> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QUrl> +#include <QProcess> +#include <QTemporaryFile> +#include <QtDebug> +#include <QEvent> + +#include <QBoxLayout> +#include <QComboBox> +#include <QErrorMessage> +#include <QFileDialog> +#include <QLabel> +#include <QMdiArea> +#include <QMdiSubWindow> +#include <QMessageBox> +#include <QUndoStack> +#include <QPlainTextEdit> +#include <QApplication> #include <projectexplorer/projectexplorer.h> #include <qt4projectmanager/qt4project.h> diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h index 667418d738..1539cf42b6 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h +++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h @@ -35,8 +35,8 @@ #include "rewriterview.h" -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> QT_BEGIN_NAMESPACE class QUndoStack; diff --git a/src/plugins/qmldesigner/components/integration/integrationcore.cpp b/src/plugins/qmldesigner/components/integration/integrationcore.cpp index cbbcb0b69b..497151b598 100644 --- a/src/plugins/qmldesigner/components/integration/integrationcore.cpp +++ b/src/plugins/qmldesigner/components/integration/integrationcore.cpp @@ -36,8 +36,8 @@ #include "navigatorwidget.h" #include "metainfo.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QObject> +#include <QCoreApplication> +#include <QObject> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/integration/integrationcore.h b/src/plugins/qmldesigner/components/integration/integrationcore.h index 5d6a99cc6a..104b8a7bf4 100644 --- a/src/plugins/qmldesigner/components/integration/integrationcore.h +++ b/src/plugins/qmldesigner/components/integration/integrationcore.h @@ -33,7 +33,7 @@ #ifndef QMLDESIGNERCORE_H #define QMLDESIGNERCORE_H -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp index 6f9b4cbf2c..ccd1891cbc 100644 --- a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp +++ b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtGui/QStackedWidget> +#include <QStackedWidget> #include "designdocumentcontroller.h" #include "stackedutilitypanelcontroller.h" diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp index 46686d8469..62f003f0b8 100644 --- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp +++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp @@ -32,9 +32,9 @@ #include <QtDebug> #include <QEvent> -#include <QtGui/QDockWidget> -#include <QtGui/QVBoxLayout> -#include <QtGui/QWidget> +#include <QDockWidget> +#include <QVBoxLayout> +#include <QWidget> #include "utilitypanelcontroller.h" diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h index 9dc03c41a6..5e55bfa5dd 100644 --- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h +++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h @@ -33,9 +33,9 @@ #ifndef UtilityPanelController_h #define UtilityPanelController_h -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtGui/QWidget> +#include <QObject> +#include <QString> +#include <QWidget> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp index 7a45eea32c..500533dc53 100644 --- a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp +++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp @@ -30,10 +30,10 @@ ** **************************************************************************/ -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QObject> -#include <QtCore/QCoreApplication> +#include <QDebug> +#include <QDir> +#include <QObject> +#include <QCoreApplication> #include "xuifiledialog.h" diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.h b/src/plugins/qmldesigner/components/integration/xuifiledialog.h index 1f14c1c754..ab60c052a0 100644 --- a/src/plugins/qmldesigner/components/integration/xuifiledialog.h +++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.h @@ -33,10 +33,10 @@ #ifndef XUIFILEDIALOG_H #define XUIFILEDIALOG_H -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QString> +#include <QStringList> -#include <QtGui/QFileDialog> +#include <QFileDialog> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp index 5c252012c8..047c38334c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp @@ -32,8 +32,8 @@ #include "customdraganddrop.h" -#include <QtCore/QMimeData> -#include <QtCore/QPoint> +#include <QMimeData> +#include <QPoint> #include <QLabel> #include <QMouseEvent> diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp index fe724e4b56..263743e066 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp @@ -33,12 +33,12 @@ #include "itemlibrarycomponents.h" #include "customdraganddrop.h" -#include <QtCore/QMimeData> -#include <QtCore/QDebug> +#include <QMimeData> +#include <QDebug> -#include <QtGui/QImage> -#include <QtGui/QPixmap> -#include <QtGui/QDrag> +#include <QImage> +#include <QPixmap> +#include <QDrag> #include <QPainter> #include <QLabel> #include <itemlibraryinfo.h> diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h index 041161f490..e4cec2d68e 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h @@ -33,8 +33,8 @@ #ifndef ITEMLIBRARYTREEVIEW_H #define ITEMLIBRARYTREEVIEW_H -#include <QtGui/QTreeView> -#include <QtGui/QStandardItemModel> +#include <QTreeView> +#include <QStandardItemModel> #include <QDrag> #include <QDebug> #include <QTimeLine> diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h index 876dbe532b..f97c761a2b 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h @@ -34,8 +34,8 @@ #define ITEMLIBRARYWIDGET_H #include "itemlibraryinfo.h" -#include <QtGui/QFrame> -#include <QtGui/QToolButton> +#include <QFrame> +#include <QToolButton> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp index 65d43640c8..17268978de 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp @@ -30,9 +30,9 @@ ** **************************************************************************/ -#include <QtGui/QBoxLayout> -#include <QtGui/QTreeView> -#include <QtGui/QHeaderView> +#include <QBoxLayout> +#include <QTreeView> +#include <QHeaderView> #include <model.h> #include "navigatorwidget.h" diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h index 9e328207ab..47ece120c9 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h @@ -35,7 +35,7 @@ #include <QFrame> #include <QAbstractItemModel> -#include <QtGui/QToolButton> +#include <QToolButton> #include "navigatortreeview.h" diff --git a/src/plugins/qmldesigner/components/pluginmanager/iplugin.h b/src/plugins/qmldesigner/components/pluginmanager/iplugin.h index 35e42937c6..c268be8ae1 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/iplugin.h +++ b/src/plugins/qmldesigner/components/pluginmanager/iplugin.h @@ -33,7 +33,7 @@ #ifndef IPLUGIN_H #define IPLUGIN_H -#include <QtCore/QObject> +#include <QObject> #define QMLDESIGNER_PLUGIN_INTERFACE "com.Nokia.QmlDesigner.IPlugin.v10" diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp index fb667547dc..f3dc7f0c88 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp +++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp @@ -35,24 +35,24 @@ #include "pluginpath.h" #include <metainfo.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QObject> -#include <QtCore/QSharedData> -#include <QtCore/QDir> -#include <QtCore/QStringList> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QObject> +#include <QSharedData> +#include <QDir> +#include <QStringList> +#include <QDebug> #include <QWeakPointer> -#include <QtCore/QPluginLoader> -#include <QtCore/QFileInfo> -#include <QtCore/QLibraryInfo> - -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QTreeView> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDialog> -#include <QtGui/QLabel> -#include <QtGui/QDialogButtonBox> +#include <QPluginLoader> +#include <QFileInfo> +#include <QLibraryInfo> + +#include <QStandardItemModel> +#include <QStandardItem> +#include <QTreeView> +#include <QVBoxLayout> +#include <QDialog> +#include <QLabel> +#include <QDialogButtonBox> enum { debug = 0 }; diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h index 8cbf4bb1e0..e5bc79eebc 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h +++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h @@ -34,8 +34,8 @@ #define PLUGINMANAGER_H -#include <QtCore/QObject> -#include <QtCore/QList> +#include <QObject> +#include <QList> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp index ba652cf57b..13bd5cf407 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp +++ b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp @@ -32,14 +32,14 @@ #include "pluginpath.h" #include <iplugin.h> -#include <QtCore/QLibrary> +#include <QLibrary> #include <QWeakPointer> -#include <QtCore/QPluginLoader> -#include <QtCore/QFileInfo> -#include <QtCore/QLibraryInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QObject> -#include <QtCore/QSharedData> +#include <QPluginLoader> +#include <QFileInfo> +#include <QLibraryInfo> +#include <QCoreApplication> +#include <QObject> +#include <QSharedData> #include <QDebug> enum { debug = 1 }; diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h index 934e41182c..7a15f4cccc 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h +++ b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h @@ -35,11 +35,11 @@ #include "pluginmanager.h" -#include <QtCore/QObject> +#include <QObject> #include <QWeakPointer> -#include <QtCore/QList> -#include <QtCore/QDir> -#include <QtGui/QStandardItem> +#include <QList> +#include <QDir> +#include <QStandardItem> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index 39da848c90..76192b898f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -36,7 +36,7 @@ #include <QDeclarativeContext> #include <QDeclarativeEngine> #include <QDeclarativeComponent> -#include <QtCore/QDebug> +#include <QDebug> #include <QFile> #include <QPixmap> #include <QTimeLine> diff --git a/src/plugins/qmldesigner/components/propertyeditor/filewidget.h b/src/plugins/qmldesigner/components/propertyeditor/filewidget.h index 9fdc9ef3f5..ee6b5cd7a7 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/filewidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/filewidget.h @@ -34,7 +34,7 @@ #ifndef FILEWIDGET_H #define FILEWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> #include <QLabel> #include <QToolButton> #include <QLineEdit> diff --git a/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h b/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h index 8fae5bb011..a62702b02f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h @@ -34,7 +34,7 @@ #ifndef LAYOUTWIDGET_H #define LAYOUTWIDGET_H -#include <QtGui/QFrame> +#include <QFrame> #include <QLabel> #include <QPushButton> #include <QUrl> diff --git a/src/plugins/qmldesigner/components/propertyeditor/originwidget.h b/src/plugins/qmldesigner/components/propertyeditor/originwidget.h index 767e1db7b6..8d4b721298 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/originwidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/originwidget.h @@ -33,7 +33,7 @@ #ifndef ORIGINWIDGET_H #define ORIGINWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp index c092034159..24059afbac 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp @@ -60,17 +60,17 @@ #include <utils/fileutils.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileSystemWatcher> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtDeclarative/QDeclarativeView> -#include <QtDeclarative/QDeclarativeContext> -#include <QtGui/QVBoxLayout> -#include <QtGui/QShortcut> -#include <QtGui/QStackedWidget> +#include <QCoreApplication> +#include <QDir> +#include <QFileSystemWatcher> +#include <QFileInfo> +#include <QDebug> +#include <QTimer> +#include <QDeclarativeView> +#include <QDeclarativeContext> +#include <QVBoxLayout> +#include <QShortcut> +#include <QStackedWidget> #include <QDeclarativeEngine> #include <private/qdeclarativemetatype_p.h> #include <QMessageBox> diff --git a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.h b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.h index d78fb99cbb..a9c321d4a8 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.h @@ -33,8 +33,8 @@ #ifndef ResetWidget_h #define ResetWidget_h -#include <QtGui/QGroupBox> -#include <QtGui/QPushButton> +#include <QGroupBox> +#include <QPushButton> QT_BEGIN_NAMESPACE class QListWidget; diff --git a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.h b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.h index d3778a470f..a7487589a1 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.h +++ b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.h @@ -33,7 +33,7 @@ #ifndef SIBLINGCOMBOBOX_H #define SIBLINGCOMBOBOX_H -#include <QtGui/QComboBox> +#include <QComboBox> #include <qmlitemnode.h> diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h index 5102bc727c..8526671a12 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h @@ -35,8 +35,8 @@ #include"abstractview.h" -#include <QtDeclarative/QDeclarativeImageProvider> -#include <QtCore/QWeakPointer> +#include <QDeclarativeImageProvider> +#include <QWeakPointer> namespace QmlDesigner { namespace Internal { diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp index 1155d215f1..b891524188 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp @@ -33,7 +33,7 @@ #include "stateseditormodel.h" #include "stateseditorview.h" -#include <QtCore/QDebug> +#include <QDebug> #include <QMessageBox> #include <nodelistproperty.h> diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index 5288b4d67e..a15c47ba51 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -39,18 +39,18 @@ #include <invalidargumentexception.h> #include <invalidqmlsourceexception.h> -#include <QtCore/QFile> +#include <QFile> #include <qapplication.h> -#include <QtGui/QBoxLayout> -#include <QtGui/QListWidget> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> +#include <QBoxLayout> +#include <QListWidget> +#include <QPushButton> +#include <QMessageBox> -#include <QtDeclarative/QDeclarativeView> -#include <QtDeclarative/QDeclarativeContext> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeItem> +#include <QDeclarativeView> +#include <QDeclarativeContext> +#include <QDeclarativeEngine> +#include <QDeclarativeItem> enum { debug = false diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h index 8c3bf5d2ef..d683adfbb5 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h @@ -33,8 +33,8 @@ #ifndef STATESEDITORWIDGET_H #define STATESEDITORWIDGET_H -#include <QtGui/QWidget> -#include <QtGui/QListWidgetItem> +#include <QWidget> +#include <QListWidgetItem> QT_BEGIN_NAMESPACE class QDeclarativeView; diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp index 655f4a17d8..d527a1ba9b 100644 --- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp +++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp @@ -32,7 +32,7 @@ #include "customstyleplugin.h" #include <widgetplugin_helper.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h index cc3d6d7d28..83a87fabfd 100644 --- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h +++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h @@ -34,7 +34,7 @@ #define CUSTOMSTYLEPLUGIN_H #include <iwidgetplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <qdeclarative.h> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h index d1982d4bd1..879b1a9b81 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h @@ -36,7 +36,7 @@ #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsdocument.h> -#include <QtCore/QString> +#include <QString> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h index 38a1adb56f..fdeb93fa8b 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h @@ -33,7 +33,7 @@ #ifndef CHANGEIMPORTSVISITOR_H #define CHANGEIMPORTSVISITOR_H -#include <QtCore/QSet> +#include <QSet> #include "import.h" #include "qmlrewriter.h" diff --git a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp index 911829a4f7..7499643926 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp @@ -34,7 +34,7 @@ #include <qmljs/parser/qmljsast_p.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlDesigner; diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp index 63a71269b9..f4fc54c24e 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp @@ -36,7 +36,7 @@ #include <qmljs/parser/qmljsast_p.h> #include <qmljs/parser/qmljsengine_p.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h index b813846a47..5e0bf52886 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h @@ -35,7 +35,7 @@ #include "qmlrewriter.h" -#include <QtCore/QStack> +#include <QStack> namespace QmlDesigner { namespace Internal { diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp index 22e567e5d9..1471d169b6 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp @@ -36,7 +36,7 @@ #include <qmljs/parser/qmljsast_p.h> #include <qmljs/parser/qmljsengine_p.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h index 60e8da3697..2007dd4ef7 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h @@ -38,8 +38,8 @@ #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsutils.h> -#include <QtCore/QStack> -#include <QtCore/QString> +#include <QStack> +#include <QString> namespace QmlDesigner { namespace Internal { diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h index 564ac49bf4..1aa9eb2101 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h @@ -33,7 +33,7 @@ #ifndef ABSTRACTROPERTY_H #define ABSTRACTROPERTY_H -#include <QtCore/QVariant> +#include <QVariant> #include <QWeakPointer> #include <QSharedPointer> #include "corelib_global.h" diff --git a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h index 5031d352d6..1756e3b2d7 100644 --- a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h @@ -39,7 +39,7 @@ #include <texteditor/basetexteditor.h> -#include <QtCore/QStringList> +#include <QStringList> namespace QmlJS { class Snapshot; diff --git a/src/plugins/qmldesigner/designercore/include/corelib_global.h b/src/plugins/qmldesigner/designercore/include/corelib_global.h index 9bd03474cd..a6ecf4c3fd 100644 --- a/src/plugins/qmldesigner/designercore/include/corelib_global.h +++ b/src/plugins/qmldesigner/designercore/include/corelib_global.h @@ -54,6 +54,6 @@ //# define TEST_CORESHARED_EXPORT //#endif -#include <QtCore/qglobal.h> +#include <qglobal.h> #endif // CORELIB_GLOBAL_H diff --git a/src/plugins/qmldesigner/designercore/include/import.h b/src/plugins/qmldesigner/designercore/include/import.h index 511dea263c..e767227de9 100644 --- a/src/plugins/qmldesigner/designercore/include/import.h +++ b/src/plugins/qmldesigner/designercore/include/import.h @@ -33,7 +33,7 @@ #ifndef IMPORT_H #define IMPORT_H -#include <QtCore/QString> +#include <QString> #include <QStringList> #include "corelib_global.h" diff --git a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h index 55ae4e47b6..f9ceb8f1e8 100644 --- a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h +++ b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h @@ -33,7 +33,7 @@ #ifndef IWIDGETPLUGIN_H #define IWIDGETPLUGIN_H -#include <QtCore/QObject> +#include <QObject> #define QMLDESIGNER_WIDGETPLUGIN_INTERFACE "com.Nokia.QmlDesigner.IWidgetPlugin.v10" diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h index 6df6b55137..9d874acd66 100644 --- a/src/plugins/qmldesigner/designercore/include/metainfo.h +++ b/src/plugins/qmldesigner/designercore/include/metainfo.h @@ -38,7 +38,7 @@ #include <QMultiHash> #include <QString> #include <QStringList> -#include <QtCore/QSharedPointer> +#include <QSharedPointer> #include <nodemetainfo.h> #include "itemlibraryinfo.h" diff --git a/src/plugins/qmldesigner/designercore/include/metainfoparser.h b/src/plugins/qmldesigner/designercore/include/metainfoparser.h index f310cb101c..1cd7c4f61d 100644 --- a/src/plugins/qmldesigner/designercore/include/metainfoparser.h +++ b/src/plugins/qmldesigner/designercore/include/metainfoparser.h @@ -34,9 +34,9 @@ #define METAINFOPARSER_H #include "corelib_global.h" -#include <QtCore/QXmlStreamReader> -#include <QtCore/QString> -#include <QtCore/QFile> +#include <QXmlStreamReader> +#include <QString> +#include <QFile> #include <metainfo.h> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h index b2192c975b..dc9ab652b0 100644 --- a/src/plugins/qmldesigner/designercore/include/model.h +++ b/src/plugins/qmldesigner/designercore/include/model.h @@ -34,10 +34,10 @@ #define DESIGNERMODEL_H #include <corelib_global.h> -#include <QtCore/QObject> -#include <QtCore/QMimeData> -#include <QtCore/QPair> -#include <QtDeclarative/QDeclarativeError> +#include <QObject> +#include <QMimeData> +#include <QPair> +#include <QDeclarativeError> #include <import.h> diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index 7a610701ae..635922f12b 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -35,8 +35,8 @@ #include "corelib_global.h" #include <QWeakPointer> -#include <QtCore/QList> -#include <QtCore/QMetaType> +#include <QList> +#include <QMetaType> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/plugins/qmldesigner/designercore/include/propertybinding.h b/src/plugins/qmldesigner/designercore/include/propertybinding.h index 6a056999f2..b859665ec8 100644 --- a/src/plugins/qmldesigner/designercore/include/propertybinding.h +++ b/src/plugins/qmldesigner/designercore/include/propertybinding.h @@ -33,9 +33,9 @@ #ifndef PROPERTYBINDING_H #define PROPERTYBINDING_H -#include <QtCore/QMetaType> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QMetaType> +#include <QSharedPointer> +#include <QString> #include "corelib_global.h" #include "modelnode.h" diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index d3a6dffd26..cfaa5bee83 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -37,11 +37,11 @@ #include "abstractview.h" #include "exception.h" #include <modelnodepositionstorage.h> -#include <QtCore/QHash> -#include <QtCore/QMap> +#include <QHash> +#include <QMap> #include <QPointer> #include <QWeakPointer> -#include <QtCore/QHash> +#include <QHash> #include <modelnode.h> #include <QScopedPointer> diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h index 2e492eab8b..fe935dede0 100644 --- a/src/plugins/qmldesigner/designercore/include/textmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h @@ -37,10 +37,10 @@ #include <qmljs/qmljsdocument.h> -#include <QtCore/QByteArray> -#include <QtCore/QObject> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> +#include <QByteArray> +#include <QObject> +#include <QTextCursor> +#include <QTextDocument> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/include/widgetqueryview.h b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h index 9b5c52c97c..60e0215ed1 100644 --- a/src/plugins/qmldesigner/designercore/include/widgetqueryview.h +++ b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h @@ -36,11 +36,11 @@ #include "corelib_global.h" #include "nodeinstanceview.h" #include "propertycontainer.h" -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtGui/QImage> +#include <QHash> +#include <QList> +#include <QString> +#include <QVariant> +#include <QImage> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp index 05731d7cb7..5d8fc4c054 100644 --- a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp +++ b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp @@ -30,8 +30,8 @@ ** **************************************************************************/ -#include <QtCore/QBuffer> -#include <QtCore/QDataStream> +#include <QBuffer> +#include <QDataStream> #include "copyhelper.h" #include "internalnode_p.h" diff --git a/src/plugins/qmldesigner/designercore/model/copyhelper.h b/src/plugins/qmldesigner/designercore/model/copyhelper.h index 7198f415f5..895ecf4efd 100644 --- a/src/plugins/qmldesigner/designercore/model/copyhelper.h +++ b/src/plugins/qmldesigner/designercore/model/copyhelper.h @@ -33,10 +33,10 @@ #ifndef COPYHELPER_H #define COPYHELPER_H -#include <QtCore/QByteArray> -#include <QtCore/QMimeData> -#include <QtCore/QSet> -#include <QtCore/QString> +#include <QByteArray> +#include <QMimeData> +#include <QSet> +#include <QString> #include "internalnodestate.h" #include "textlocation.h" diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp index 4778509a4b..b16b870d5a 100644 --- a/src/plugins/qmldesigner/designercore/model/import.cpp +++ b/src/plugins/qmldesigner/designercore/model/import.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtCore/QHash> +#include <QHash> #include "import.h" diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 2f3747c2a6..c34b901b7a 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -36,14 +36,14 @@ #include "invalidpropertyexception.h" #include "invalidargumentexception.h" -#include <QtCore/QFile> -#include <QtCore/QByteArray> +#include <QFile> +#include <QByteArray> #include <QWeakPointer> -#include <QtCore/QFileInfo> +#include <QFileInfo> -#include <QtGui/QUndoStack> -#include <QtXml/QXmlStreamReader> -#include <QtCore/QDebug> +#include <QUndoStack> +#include <QXmlStreamReader> +#include <QDebug> #include <QPlainTextEdit> #include <QHashIterator> diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h index cce3a38e3d..990b8992b6 100644 --- a/src/plugins/qmldesigner/designercore/model/model_p.h +++ b/src/plugins/qmldesigner/designercore/model/model_p.h @@ -33,10 +33,10 @@ #ifndef MODEL_P_H #define MODEL_P_H -#include <QtCore/QList> +#include <QList> #include <QWeakPointer> -#include <QtCore/QSet> -#include <QtCore/QUrl> +#include <QSet> +#include <QUrl> #include "modelnode.h" #include "abstractview.h" diff --git a/src/plugins/qmldesigner/designercore/model/modelrewriter.h b/src/plugins/qmldesigner/designercore/model/modelrewriter.h index 50b3d15f2a..5a711e75b7 100644 --- a/src/plugins/qmldesigner/designercore/model/modelrewriter.h +++ b/src/plugins/qmldesigner/designercore/model/modelrewriter.h @@ -33,10 +33,10 @@ #ifndef MODELREWRITER_H #define MODELREWRITER_H -#include <QtCore/QByteArray> -#include <QtCore/QMimeData> -#include <QtCore/QObject> -#include <QtCore/QUrl> +#include <QByteArray> +#include <QMimeData> +#include <QObject> +#include <QUrl> #include "anchorline.h" #include "import.h" diff --git a/src/plugins/qmldesigner/designercore/model/parsedqml.h b/src/plugins/qmldesigner/designercore/model/parsedqml.h index 20aa388bb8..d9a8f7a39d 100644 --- a/src/plugins/qmldesigner/designercore/model/parsedqml.h +++ b/src/plugins/qmldesigner/designercore/model/parsedqml.h @@ -33,7 +33,7 @@ #ifndef PARSEDQML_H #define PARSEDQML_H -#include <QtCore/QString> +#include <QString> #include <qmljsengine_p.h> #include <qmljslexer_p.h> diff --git a/src/plugins/qmldesigner/designercore/model/paster.cpp b/src/plugins/qmldesigner/designercore/model/paster.cpp index 22b585b881..6955391a3e 100644 --- a/src/plugins/qmldesigner/designercore/model/paster.cpp +++ b/src/plugins/qmldesigner/designercore/model/paster.cpp @@ -30,9 +30,9 @@ ** **************************************************************************/ -#include <QtCore/QByteArray> -#include <QtCore/QDataStream> -#include <QtCore/QSet> +#include <QByteArray> +#include <QDataStream> +#include <QSet> #include "changeimportsvisitor.h" #include "copypasteutil.h" diff --git a/src/plugins/qmldesigner/designercore/model/paster.h b/src/plugins/qmldesigner/designercore/model/paster.h index 7d78e843fd..bea719c99c 100644 --- a/src/plugins/qmldesigner/designercore/model/paster.h +++ b/src/plugins/qmldesigner/designercore/model/paster.h @@ -33,10 +33,10 @@ #ifndef PASTER_H #define PASTER_H -#include <QtCore/QList> -#include <QtCore/QMimeData> -#include <QtCore/QSet> -#include <QtCore/QString> +#include <QList> +#include <QMimeData> +#include <QSet> +#include <QString> #include "import.h" #include "internalnode_p.h" diff --git a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp index a895d0878d..568f8a4a61 100644 --- a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp @@ -36,10 +36,10 @@ #include <extensionsystem/pluginmanager.h> #include <qmljs/qmljsmodelmanagerinterface.h> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QUndoStack> +#include <QPlainTextEdit> +#include <QUndoStack> -#include <QtCore/QDebug> +#include <QDebug> using namespace Utils; using namespace QmlDesigner; diff --git a/src/plugins/qmldesigner/designercore/model/propertyparser.h b/src/plugins/qmldesigner/designercore/model/propertyparser.h index 166d2aef87..ebb4c572f4 100644 --- a/src/plugins/qmldesigner/designercore/model/propertyparser.h +++ b/src/plugins/qmldesigner/designercore/model/propertyparser.h @@ -33,7 +33,7 @@ #ifndef PROPERTYPARSER_H #define PROPERTYPARSER_H -#include <QtCore/QVariant> +#include <QVariant> namespace QmlDesigner { class MetaInfo; diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp index 4ca007b288..ae4fb17663 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp @@ -30,8 +30,8 @@ ** **************************************************************************/ -#include <QtCore/QVariant> -#include <QtGui/QColor> +#include <QVariant> +#include <QColor> #include "bindingproperty.h" #include "nodeproperty.h" diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h index 1e27b5f86d..f96bc5a9be 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h +++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h @@ -33,8 +33,8 @@ #ifndef QMLTEXTGENERATOR_H #define QMLTEXTGENERATOR_H -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QString> +#include <QStringList> #include "abstractproperty.h" #include "modelnode.h" diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp index 223a24014a..9ec4e05d44 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtCore/QDebug> +#include <QDebug> #include "nodeabstractproperty.h" #include "nodelistproperty.h" diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp index 9070861fd9..46a836d047 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtCore/QSet> +#include <QSet> #include "modelnode.h" #include "nodelistproperty.h" diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h index fb52869396..fd5409d667 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h +++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h @@ -33,7 +33,7 @@ #ifndef REWRITEACTIONCOMPRESSOR_H #define REWRITEACTIONCOMPRESSOR_H -#include <QtCore/QStringList> +#include <QStringList> #include "rewriteaction.h" diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 82de677cb5..d478cb7a49 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -56,8 +56,8 @@ #include <qmljs/qmljsutils.h> #include <qmljs/qmljsmodelmanagerinterface.h> -#include <QtCore/QSet> -#include <QtGui/QMessageBox> +#include <QSet> +#include <QMessageBox> #include <QDir> using namespace LanguageUtils; diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index 6c17ae68cf..ccd003bd2f 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -41,8 +41,8 @@ #include <qmljs/qmljsdocument.h> #include <qmljs/qmljsscopechain.h> -#include <QtCore/QStringList> -#include <QtCore/QTimer> +#include <QStringList> +#include <QTimer> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp index abb3059ff6..610de75d21 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp @@ -34,19 +34,19 @@ #include "widgetpluginpath.h" #include <iwidgetplugin.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QObject> -#include <QtCore/QSharedData> -#include <QtCore/QDir> -#include <QtCore/QStringList> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QObject> +#include <QSharedData> +#include <QDir> +#include <QStringList> +#include <QDebug> #include <QWeakPointer> -#include <QtCore/QPluginLoader> -#include <QtCore/QFileInfo> -#include <QtCore/QLibraryInfo> +#include <QPluginLoader> +#include <QFileInfo> +#include <QLibraryInfo> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> +#include <QStandardItemModel> +#include <QStandardItem> enum { debug = 0 }; diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h index 3bd641fd75..a8d353f408 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h @@ -33,8 +33,8 @@ #ifndef WIDGETPLUGINMANAGER_H #define WIDGETPLUGINMANAGER_H -#include <QtCore/QObject> -#include <QtCore/QList> +#include <QObject> +#include <QList> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp index 653f54c15d..4460ae2bd2 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp @@ -32,14 +32,14 @@ #include "widgetpluginpath.h" #include <iwidgetplugin.h> -#include <QtCore/QLibrary> +#include <QLibrary> #include <QWeakPointer> -#include <QtCore/QPluginLoader> -#include <QtCore/QFileInfo> -#include <QtCore/QLibraryInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QObject> -#include <QtCore/QSharedData> +#include <QPluginLoader> +#include <QFileInfo> +#include <QLibraryInfo> +#include <QCoreApplication> +#include <QObject> +#include <QSharedData> #include <QDebug> enum { debug = 0 }; diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h index d786dc4628..42519e9467 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h @@ -35,11 +35,11 @@ #include "widgetpluginmanager.h" -#include <QtCore/QObject> +#include <QObject> #include <QWeakPointer> -#include <QtCore/QList> -#include <QtCore/QDir> -#include <QtGui/QStandardItem> +#include <QList> +#include <QDir> +#include <QStandardItem> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp index 3f5b31bb0c..6defe845cb 100644 --- a/src/plugins/qmldesigner/designersettings.cpp +++ b/src/plugins/qmldesigner/designersettings.cpp @@ -33,7 +33,7 @@ #include "designersettings.h" #include "qmldesignerconstants.h" -#include <QtCore/QSettings> +#include <QSettings> using namespace QmlDesigner; diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index c0a2d33e1e..748138e7ff 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -34,7 +34,7 @@ #ifndef DESIGNERSETTINGS_H #define DESIGNERSETTINGS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index db3fff1eb8..5a10db3a61 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -62,19 +62,19 @@ #include <utils/qtcassert.h> #include <utils/crumblepath.h> -#include <QtCore/QSettings> -#include <QtCore/QEvent> -#include <QtCore/QDir> -#include <QtGui/QApplication> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QVBoxLayout> -#include <QtGui/QScrollArea> -#include <QtGui/QTabWidget> -#include <QtGui/QToolButton> -#include <QtGui/QMenu> -#include <QtGui/QClipboard> -#include <QtGui/QLabel> -#include <QtGui/QProgressDialog> +#include <QSettings> +#include <QEvent> +#include <QDir> +#include <QApplication> +#include <QPlainTextEdit> +#include <QVBoxLayout> +#include <QScrollArea> +#include <QTabWidget> +#include <QToolButton> +#include <QMenu> +#include <QClipboard> +#include <QLabel> +#include <QProgressDialog> using Core::MiniSplitter; using Core::IEditor; diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h index 95cd8d5fb0..baab1871b4 100644 --- a/src/plugins/qmldesigner/designmodewidget.h +++ b/src/plugins/qmldesigner/designmodewidget.h @@ -52,11 +52,11 @@ #include <QWeakPointer> #include <QDeclarativeError> -#include <QtCore/QHash> -#include <QtGui/QWidget> -#include <QtGui/QToolBar> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> +#include <QHash> +#include <QWidget> +#include <QToolBar> +#include <QComboBox> +#include <QLabel> QT_BEGIN_NAMESPACE class QStackedWidget; diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp b/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp index 174bd5168d..909a56e26b 100644 --- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp +++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp @@ -32,7 +32,7 @@ #include "desktopplugin.h" #include <widgetplugin_helper.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h index 9bc0a5d814..670ab2a35e 100644 --- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h +++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h @@ -34,7 +34,7 @@ #define DESKTOPPLUGIN_H #include <iwidgetplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <qdeclarative.h> QT_BEGIN_NAMESPACE QT_END_NAMESPACE diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp index 22e1bb6649..614d78f049 100644 --- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp @@ -32,7 +32,7 @@ #include "extrasplugin.h" #include <widgetplugin_helper.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h index 8f49b6cb46..c07a71a14a 100644 --- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h @@ -34,7 +34,7 @@ #define EXTRASPLUGIN_H #include <iwidgetplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <qdeclarative.h> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp b/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp index 30276745e3..b208c2eed2 100644 --- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp +++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp @@ -32,7 +32,7 @@ #include "meegoplugin.h" #include <widgetplugin_helper.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h index 659331a2eb..dcd20664c6 100644 --- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h +++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h @@ -34,7 +34,7 @@ #define MEEGOPLUGIN_H #include <iwidgetplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <qdeclarative.h> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index b2f1898d13..908c89b3d5 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -61,13 +61,13 @@ #include <integrationcore.h> -#include <QtGui/QAction> +#include <QAction> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/qplugin.h> -#include <QtCore/QDebug> -#include <QtCore/QProcessEnvironment> +#include <QFileInfo> +#include <QCoreApplication> +#include <qplugin.h> +#include <QDebug> +#include <QProcessEnvironment> namespace QmlDesigner { namespace Internal { diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp index 4ca2c3acc7..4c7cd5fdee 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp @@ -32,7 +32,7 @@ #include "qtquickplugin.h" #include <widgetplugin_helper.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativescalegrid_p_p.h> diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h index fb92e0f3cd..044cd8f47a 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h @@ -34,7 +34,7 @@ #define QTQUICKPLUGIN_H #include <iwidgetplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <qdeclarative.h> QT_BEGIN_NAMESPACE QT_END_NAMESPACE diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index 8f3cac9c55..20742fae36 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -37,8 +37,8 @@ #include <qmljseditor/qmljseditorconstants.h> -#include <QtCore/QTextStream> -#include <QtGui/QCheckBox> +#include <QTextStream> +#include <QCheckBox> using namespace QmlDesigner; using namespace QmlDesigner::Internal; diff --git a/src/plugins/qmldesigner/settingspage.h b/src/plugins/qmldesigner/settingspage.h index f2163f975d..7ba938c5ce 100644 --- a/src/plugins/qmldesigner/settingspage.h +++ b/src/plugins/qmldesigner/settingspage.h @@ -38,7 +38,7 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp b/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp index aaa73249f8..d159a86ab1 100644 --- a/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp +++ b/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp @@ -34,10 +34,10 @@ #include <utils/fileutils.h> -#include <QtCore/QChildEvent> -#include <QtCore/QFile> -#include <QtGui/QTabWidget> -#include <QtGui/QStackedWidget> +#include <QChildEvent> +#include <QFile> +#include <QTabWidget> +#include <QStackedWidget> #include <QDebug> StyledOutputpanePlaceHolder::StyledOutputpanePlaceHolder(Core::IMode *mode, QSplitter *parent) : Core::OutputPanePlaceHolder(mode, parent) diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp b/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp index 7b32dcc49a..e63448a4dd 100644 --- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp +++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp @@ -32,7 +32,7 @@ #include "symbianplugin.h" #include <widgetplugin_helper.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.h b/src/plugins/qmldesigner/symbianplugin/symbianplugin.h index 4f035f2f8a..125b87a1fa 100644 --- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.h +++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.h @@ -34,7 +34,7 @@ #define SymbianPLUGIN_H #include <iwidgetplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <qdeclarative.h> namespace QmlDesigner { diff --git a/src/plugins/qmljseditor/jsfilewizard.cpp b/src/plugins/qmljseditor/jsfilewizard.cpp index 8a58b7245b..a29a5af674 100644 --- a/src/plugins/qmljseditor/jsfilewizard.cpp +++ b/src/plugins/qmljseditor/jsfilewizard.cpp @@ -38,12 +38,12 @@ #include <utils/qtcassert.h> #include <utils/filewizarddialog.h> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtGui/QWizard> -#include <QtGui/QPushButton> -#include <QtGui/QBoxLayout> -#include <QtGui/QCheckBox> +#include <QFileInfo> +#include <QTextStream> +#include <QWizard> +#include <QPushButton> +#include <QBoxLayout> +#include <QCheckBox> namespace { class JsFileOptionsPage : public QWizardPage diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp index 714bd030ec..a355f4ca1e 100644 --- a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp +++ b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp @@ -35,9 +35,9 @@ #include <qmljs/parser/qmljsast_p.h> #include <qmljs/qmljsscanner.h> -#include <QtGui/QTextBlock> +#include <QTextBlock> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.h b/src/plugins/qmljseditor/qmlexpressionundercursor.h index 64c92db0da..5371366bac 100644 --- a/src/plugins/qmljseditor/qmlexpressionundercursor.h +++ b/src/plugins/qmljseditor/qmlexpressionundercursor.h @@ -36,7 +36,7 @@ #include <qmljs/parser/qmljsastfwd_p.h> #include <qmljs/qmljsdocument.h> -#include <QtGui/QTextCursor> +#include <QTextCursor> namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmlfilewizard.cpp b/src/plugins/qmljseditor/qmlfilewizard.cpp index 3ee453ebd0..5456908c8e 100644 --- a/src/plugins/qmljseditor/qmlfilewizard.cpp +++ b/src/plugins/qmljseditor/qmlfilewizard.cpp @@ -34,8 +34,8 @@ #include <qmljstools/qmljstoolsconstants.h> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> +#include <QFileInfo> +#include <QTextStream> using namespace QmlJSEditor; diff --git a/src/plugins/qmljseditor/qmljsautocompleter.cpp b/src/plugins/qmljseditor/qmljsautocompleter.cpp index e4a016e990..96018c4989 100644 --- a/src/plugins/qmljseditor/qmljsautocompleter.cpp +++ b/src/plugins/qmljseditor/qmljsautocompleter.cpp @@ -34,11 +34,11 @@ #include <qmljs/qmljsscanner.h> -#include <QtCore/QChar> -#include <QtCore/QLatin1Char> -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> +#include <QChar> +#include <QLatin1Char> +#include <QTextDocument> +#include <QTextCursor> +#include <QTextBlock> using namespace QmlJSEditor; using namespace Internal; diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index 2c23ddc45c..f90da289a4 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -56,14 +56,14 @@ #include <qmljs/qmljscompletioncontextfinder.h> #include <qmljs/qmljsscopebuilder.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QtAlgorithms> -#include <QtCore/QDirIterator> -#include <QtCore/QStringList> -#include <QtGui/QIcon> +#include <QFile> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QtAlgorithms> +#include <QDirIterator> +#include <QStringList> +#include <QIcon> using namespace QmlJS; using namespace QmlJSEditor; diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h index 285fd85224..684918add5 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.h +++ b/src/plugins/qmljseditor/qmljscompletionassist.h @@ -42,10 +42,10 @@ #include <texteditor/snippets/snippetassistcollector.h> #include <texteditor/codeassist/defaultassistinterface.h> -#include <QtCore/QStringList> -#include <QtCore/QScopedPointer> -#include <QtCore/QVariant> -#include <QtGui/QIcon> +#include <QStringList> +#include <QScopedPointer> +#include <QVariant> +#include <QIcon> namespace QmlJS { class Value; diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp index d2ae66345b..83bc4cf1c3 100644 --- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp +++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp @@ -41,9 +41,9 @@ #include <qmljs/qmljsutils.h> #include <qmljstools/qmljsrefactoringchanges.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfo> using namespace QmlJS::AST; using namespace QmlJSEditor; diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp index c59f469d0d..35b94b4984 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp @@ -33,8 +33,8 @@ #include "qmljscomponentnamedialog.h" #include "ui_qmljscomponentnamedialog.h" -#include <QtCore/QFileInfo> -#include <QtGui/QFileDialog> +#include <QFileInfo> +#include <QFileDialog> using namespace QmlJSEditor::Internal; diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.h b/src/plugins/qmljseditor/qmljscomponentnamedialog.h index aacf4e615f..b59536e9f7 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.h +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.h @@ -33,7 +33,7 @@ #ifndef QMLJSCOMPONENTNAMEDIALOG_H #define QMLJSCOMPONENTNAMEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 476c7aa9ff..5be159ff91 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -81,19 +81,19 @@ #include <utils/uncommentselection.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QSignalMapper> -#include <QtCore/QTimer> -#include <QtCore/QScopedPointer> -#include <QtCore/QTextCodec> - -#include <QtGui/QMenu> -#include <QtGui/QComboBox> -#include <QtGui/QHeaderView> -#include <QtGui/QInputDialog> -#include <QtGui/QMainWindow> -#include <QtGui/QToolBar> -#include <QtGui/QTreeView> +#include <QFileInfo> +#include <QSignalMapper> +#include <QTimer> +#include <QScopedPointer> +#include <QTextCodec> + +#include <QMenu> +#include <QComboBox> +#include <QHeaderView> +#include <QInputDialog> +#include <QMainWindow> +#include <QToolBar> +#include <QTreeView> enum { UPDATE_DOCUMENT_DEFAULT_INTERVAL = 100, diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 4f561dddd6..b97f327083 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -42,8 +42,8 @@ #include <texteditor/basetexteditor.h> #include <texteditor/quickfix.h> -#include <QtCore/QSharedPointer> -#include <QtCore/QModelIndex> +#include <QSharedPointer> +#include <QModelIndex> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/qmljseditor/qmljseditoractionhandler.cpp b/src/plugins/qmljseditor/qmljseditoractionhandler.cpp index 8db0ddd40c..f4055c506d 100644 --- a/src/plugins/qmljseditor/qmljseditoractionhandler.cpp +++ b/src/plugins/qmljseditor/qmljseditoractionhandler.cpp @@ -37,10 +37,10 @@ #include <coreplugin/icore.h> #include <coreplugin/actionmanager/actionmanager.h> -#include <QtCore/QDebug> -#include <QtGui/QAction> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QAction> +#include <QMainWindow> +#include <QMessageBox> namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljseditorconstants.h b/src/plugins/qmljseditor/qmljseditorconstants.h index dbbda7df55..dda05bb967 100644 --- a/src/plugins/qmljseditor/qmljseditorconstants.h +++ b/src/plugins/qmljseditor/qmljseditorconstants.h @@ -33,7 +33,7 @@ #ifndef QMLJSEDITOR_CONSTANTS_H #define QMLJSEDITOR_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace QmlJSEditor { namespace Constants { diff --git a/src/plugins/qmljseditor/qmljseditorfactory.cpp b/src/plugins/qmljseditor/qmljseditorfactory.cpp index 38e7abae50..e5b6d470ab 100644 --- a/src/plugins/qmljseditor/qmljseditorfactory.cpp +++ b/src/plugins/qmljseditor/qmljseditorfactory.cpp @@ -46,12 +46,12 @@ #include <coreplugin/infobar.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QMainWindow> +#include <QFileInfo> +#include <QDebug> +#include <QSettings> +#include <QMessageBox> +#include <QPushButton> +#include <QMainWindow> using namespace QmlJSEditor; using namespace QmlJSEditor::Internal; diff --git a/src/plugins/qmljseditor/qmljseditorfactory.h b/src/plugins/qmljseditor/qmljseditorfactory.h index 76f6ae602a..f5fa8e6c5f 100644 --- a/src/plugins/qmljseditor/qmljseditorfactory.h +++ b/src/plugins/qmljseditor/qmljseditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 5e8a3804a8..6795134d62 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -72,14 +72,14 @@ #include <utils/qtcassert.h> #include <utils/json.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QDir> -#include <QtCore/QCoreApplication> -#include <QtCore/QTimer> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QDebug> +#include <QSettings> +#include <QDir> +#include <QCoreApplication> +#include <QTimer> +#include <QMenu> +#include <QAction> using namespace QmlJSEditor; using namespace QmlJSEditor::Internal; diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h index 3905f8b001..1633f0fd84 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.h +++ b/src/plugins/qmljseditor/qmljseditorplugin.h @@ -37,7 +37,7 @@ #include <coreplugin/icontext.h> #include <coreplugin/id.h> -#include <QtCore/QPointer> +#include <QPointer> QT_FORWARD_DECLARE_CLASS(QAction) diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index 49a024a1a5..d7abe55dc8 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.cpp +++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp @@ -55,13 +55,13 @@ #include "qmljseditorconstants.h" -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QtConcurrentMap> -#include <QtCore/QDir> -#include <QtGui/QApplication> -#include <QtGui/QLabel> +#include <QTime> +#include <QTimer> +#include <QtConcurrentRun> +#include <QtConcurrentMap> +#include <QDir> +#include <QApplication> +#include <QLabel> #include <utils/runextensions.h> #include <functional> diff --git a/src/plugins/qmljseditor/qmljsfindreferences.h b/src/plugins/qmljseditor/qmljsfindreferences.h index e78314a97b..a525979651 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.h +++ b/src/plugins/qmljseditor/qmljsfindreferences.h @@ -33,11 +33,11 @@ #ifndef QMLJSFINDREFERENCES_H #define QMLJSFINDREFERENCES_H -#include <QtCore/QMutex> -#include <QtCore/QObject> -#include <QtCore/QFuture> -#include <QtCore/QFutureWatcher> -#include <QtCore/QPointer> +#include <QMutex> +#include <QObject> +#include <QFuture> +#include <QFutureWatcher> +#include <QPointer> #include <utils/filesearch.h> #include <qmljs/qmljsdocument.h> diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp index 2638ce35e7..9956c754b1 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.cpp +++ b/src/plugins/qmljseditor/qmljshighlighter.cpp @@ -32,9 +32,9 @@ #include "qmljshighlighter.h" -#include <QtCore/QSet> -#include <QtCore/QtAlgorithms> -#include <QtCore/QDebug> +#include <QSet> +#include <QtAlgorithms> +#include <QDebug> #include <utils/qtcassert.h> diff --git a/src/plugins/qmljseditor/qmljshighlighter.h b/src/plugins/qmljseditor/qmljshighlighter.h index 04204c54e8..4cde6ba3cf 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.h +++ b/src/plugins/qmljseditor/qmljshighlighter.h @@ -37,9 +37,9 @@ #include <qmljs/qmljsscanner.h> -#include <QtCore/QVector> -#include <QtCore/QSet> -#include <QtGui/QSyntaxHighlighter> +#include <QVector> +#include <QSet> +#include <QSyntaxHighlighter> #include <texteditor/basetextdocumentlayout.h> #include <texteditor/syntaxhighlighter.h> diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 2de341276d..4155aefb6a 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -52,7 +52,7 @@ #include <texteditor/tooltip/tooltip.h> #include <texteditor/tooltip/tipcontents.h> -#include <QtCore/QList> +#include <QList> using namespace Core; using namespace QmlJS; diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h index d21876b7ec..f095528999 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.h +++ b/src/plugins/qmljseditor/qmljshoverhandler.h @@ -36,7 +36,7 @@ #include <qmljs/qmljsmodelmanagerinterface.h> #include <texteditor/basehoverhandler.h> -#include <QtGui/QColor> +#include <QColor> QT_BEGIN_NAMESPACE template <class> class QList; diff --git a/src/plugins/qmljseditor/qmljsoutline.cpp b/src/plugins/qmljseditor/qmljsoutline.cpp index 4511c06049..8bd602dc2a 100644 --- a/src/plugins/qmljseditor/qmljsoutline.cpp +++ b/src/plugins/qmljseditor/qmljsoutline.cpp @@ -39,11 +39,11 @@ #include <coreplugin/ifile.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtGui/QAction> -#include <QtGui/QVBoxLayout> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QSettings> +#include <QAction> +#include <QVBoxLayout> +#include <QTextBlock> using namespace QmlJS; diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h index 407be39cf7..fee09f56a1 100644 --- a/src/plugins/qmljseditor/qmljsoutline.h +++ b/src/plugins/qmljseditor/qmljsoutline.h @@ -37,7 +37,7 @@ #include <texteditor/ioutlinewidget.h> -#include <QtGui/QSortFilterProxyModel> +#include <QSortFilterProxyModel> namespace Core { class IEditor; diff --git a/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp b/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp index 32312c70e6..bb3d0df82d 100644 --- a/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp +++ b/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp @@ -34,7 +34,7 @@ #include "qmloutlinemodel.h" #include <utils/annotateditemdelegate.h> -#include <QtGui/QMenu> +#include <QMenu> namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.cpp b/src/plugins/qmljseditor/qmljspreviewrunner.cpp index 8825eb167c..a8829557b9 100644 --- a/src/plugins/qmljseditor/qmljspreviewrunner.cpp +++ b/src/plugins/qmljseditor/qmljspreviewrunner.cpp @@ -36,10 +36,10 @@ #include <utils/qtcprocess.h> #include <utils/synchronousprocess.h> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> +#include <QMessageBox> +#include <QApplication> -#include <QtCore/QDebug> +#include <QDebug> namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.h b/src/plugins/qmljseditor/qmljspreviewrunner.h index 05417a649a..fb9401d830 100644 --- a/src/plugins/qmljseditor/qmljspreviewrunner.h +++ b/src/plugins/qmljseditor/qmljspreviewrunner.h @@ -33,7 +33,7 @@ #ifndef QMLJSPREVIEWRUNNER_H #define QMLJSPREVIEWRUNNER_H -#include <QtCore/QObject> +#include <QObject> #include <projectexplorer/applicationlauncher.h> diff --git a/src/plugins/qmljseditor/qmljsquickfix.cpp b/src/plugins/qmljseditor/qmljsquickfix.cpp index 1993e85cd5..aa3dd8c020 100644 --- a/src/plugins/qmljseditor/qmljsquickfix.cpp +++ b/src/plugins/qmljseditor/qmljsquickfix.cpp @@ -41,7 +41,7 @@ #include <qmljs/qmljsmodelmanagerinterface.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h index 36ed61ae8e..c022b236e9 100644 --- a/src/plugins/qmljseditor/qmljsquickfix.h +++ b/src/plugins/qmljseditor/qmljsquickfix.h @@ -40,7 +40,7 @@ #include <qmljs/qmljsdocument.h> #include <qmljstools/qmljsrefactoringchanges.h> -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace ExtensionSystem { class IPlugin; diff --git a/src/plugins/qmljseditor/qmljsquickfixes.cpp b/src/plugins/qmljseditor/qmljsquickfixes.cpp index bfca73b9d1..acfe03f52e 100644 --- a/src/plugins/qmljseditor/qmljsquickfixes.cpp +++ b/src/plugins/qmljseditor/qmljsquickfixes.cpp @@ -41,7 +41,7 @@ #include <qmljs/parser/qmljsast_p.h> #include <qmljstools/qmljsrefactoringchanges.h> -#include <QtGui/QApplication> +#include <QApplication> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljseditor/qmljsreuse.cpp b/src/plugins/qmljseditor/qmljsreuse.cpp index 4d9b9130d4..7e072af01b 100644 --- a/src/plugins/qmljseditor/qmljsreuse.cpp +++ b/src/plugins/qmljseditor/qmljsreuse.cpp @@ -32,8 +32,8 @@ #include "qmljsreuse.h" -#include <QtCore/QChar> -#include <QtGui/QPainter> +#include <QChar> +#include <QPainter> namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljsreuse.h b/src/plugins/qmljseditor/qmljsreuse.h index 14f0ca74eb..4b722ed77f 100644 --- a/src/plugins/qmljseditor/qmljsreuse.h +++ b/src/plugins/qmljseditor/qmljsreuse.h @@ -33,8 +33,8 @@ #ifndef QMLJSREUSE_H #define QMLJSREUSE_H -#include <QtCore/QtGlobal> -#include <QtGui/QIcon> +#include <QtGlobal> +#include <QIcon> QT_BEGIN_NAMESPACE class QChar; diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp index 6552e3a886..08384fadd0 100644 --- a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp +++ b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp @@ -49,9 +49,9 @@ #include <texteditor/fontsettings.h> #include <utils/qtcassert.h> -#include <QtCore/QThreadPool> -#include <QtCore/QFutureInterface> -#include <QtCore/QRunnable> +#include <QThreadPool> +#include <QFutureInterface> +#include <QRunnable> using namespace QmlJSEditor; using namespace QmlJSEditor::Internal; diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.h b/src/plugins/qmljseditor/qmljssemantichighlighter.h index c97e4666f8..b1c1503139 100644 --- a/src/plugins/qmljseditor/qmljssemantichighlighter.h +++ b/src/plugins/qmljseditor/qmljssemantichighlighter.h @@ -34,7 +34,7 @@ #define QMLJSSEMANTICHIGHLIGHTER_H #include <texteditor/semantichighlighter.h> -#include <QtCore/QFutureWatcher> +#include <QFutureWatcher> namespace QmlJS { class ScopeChain; diff --git a/src/plugins/qmljseditor/qmljssemanticinfoupdater.h b/src/plugins/qmljseditor/qmljssemanticinfoupdater.h index e0f6b014e0..0237e1ca86 100644 --- a/src/plugins/qmljseditor/qmljssemanticinfoupdater.h +++ b/src/plugins/qmljseditor/qmljssemanticinfoupdater.h @@ -35,10 +35,10 @@ #include "qmljseditor.h" -#include <QtCore/QWaitCondition> -#include <QtCore/QModelIndex> -#include <QtCore/QMutex> -#include <QtCore/QThread> +#include <QWaitCondition> +#include <QModelIndex> +#include <QMutex> +#include <QThread> namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljssnippetprovider.cpp b/src/plugins/qmljseditor/qmljssnippetprovider.cpp index 632d1c49cd..4b4ad0f5af 100644 --- a/src/plugins/qmljseditor/qmljssnippetprovider.cpp +++ b/src/plugins/qmljseditor/qmljssnippetprovider.cpp @@ -43,8 +43,8 @@ #include <qmljstools/qmljsindenter.h> -#include <QtCore/QLatin1String> -#include <QtCore/QCoreApplication> +#include <QLatin1String> +#include <QCoreApplication> using namespace QmlJSEditor; using namespace Internal; diff --git a/src/plugins/qmljseditor/qmljswrapinloader.cpp b/src/plugins/qmljseditor/qmljswrapinloader.cpp index 478d6e10ee..e1887bf2cd 100644 --- a/src/plugins/qmljseditor/qmljswrapinloader.cpp +++ b/src/plugins/qmljseditor/qmljswrapinloader.cpp @@ -41,9 +41,9 @@ #include <qmljs/qmljsbind.h> #include <qmljstools/qmljsrefactoringchanges.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QFileInfo> +#include <QCoreApplication> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp index 8b5de46f96..fac663e44c 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.cpp +++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp @@ -43,9 +43,9 @@ #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtCore/QDebug> -#include <QtCore/QTime> -#include <QtCore/QMimeData> +#include <QDebug> +#include <QTime> +#include <QMimeData> #include <typeinfo> using namespace QmlJS; diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h index 09e605ddb0..9027c52ebc 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.h +++ b/src/plugins/qmljseditor/qmloutlinemodel.h @@ -38,7 +38,7 @@ #include <qmljs/qmljsdocument.h> #include <qmljs/qmljsicons.h> -#include <QtGui/QStandardItemModel> +#include <QStandardItemModel> namespace QmlJS { class Value; diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp index 1bfb716c1f..ee168a0878 100644 --- a/src/plugins/qmljseditor/qmltaskmanager.cpp +++ b/src/plugins/qmljseditor/qmltaskmanager.cpp @@ -43,8 +43,8 @@ #include <qmljseditor/qmljseditor.h> #include <qmljseditor/qmljseditoreditable.h> -#include <QtCore/QDebug> -#include <QtCore/QtConcurrentRun> +#include <QDebug> +#include <QtConcurrentRun> #include <utils/runextensions.h> using namespace QmlJS; diff --git a/src/plugins/qmljseditor/qmltaskmanager.h b/src/plugins/qmljseditor/qmltaskmanager.h index c4b8cd3751..e92942c054 100644 --- a/src/plugins/qmljseditor/qmltaskmanager.h +++ b/src/plugins/qmljseditor/qmltaskmanager.h @@ -37,12 +37,12 @@ #include <qmljs/qmljsdocument.h> #include <qmljs/qmljsmodelmanagerinterface.h> -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QHash> -#include <QtCore/QString> -#include <QtCore/QFutureWatcher> -#include <QtCore/QTimer> +#include <QObject> +#include <QList> +#include <QHash> +#include <QString> +#include <QFutureWatcher> +#include <QTimer> namespace QmlJSEditor { class QmlJSTextEditorWidget; diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 3c5d082bb4..7b98329583 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -50,7 +50,7 @@ #include <coreplugin/icore.h> #include <customcolordialog.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace AST; diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp index f59a24a36c..40ebec1b63 100644 --- a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp +++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp @@ -36,9 +36,9 @@ #include <qmldesigner/qmldesignerconstants.h> #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtGui/QCheckBox> +#include <QSettings> +#include <QTextStream> +#include <QCheckBox> using namespace QmlJSEditor; diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.h b/src/plugins/qmljseditor/quicktoolbarsettingspage.h index 1f2ad3f361..bfa8e6e4d0 100644 --- a/src/plugins/qmljseditor/quicktoolbarsettingspage.h +++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.h @@ -36,7 +36,7 @@ #include "ui_quicktoolbarsettingspage.h" #include <coreplugin/dialogs/ioptionspage.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp index 7995a2256a..418de0119f 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp +++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp @@ -43,8 +43,8 @@ #include <utils/qtcassert.h> #include <projectexplorer/project.h> -#include <QtCore/QUrl> -#include <QtNetwork/QAbstractSocket> +#include <QUrl> +#include <QAbstractSocket> using namespace QmlJSInspector::Internal; diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h index ab5f841909..2824e3cc2d 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.h +++ b/src/plugins/qmljsinspector/qmljsclientproxy.h @@ -34,7 +34,7 @@ #include "qmljsinspectorplugin.h" #include "qmljsprivateapi.h" -#include <QtCore/QObject> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QUrl) diff --git a/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp b/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp index 2f946cdda5..d12e1682e2 100644 --- a/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp +++ b/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "qmljscontextcrumblepath.h" -#include <QtGui/QMouseEvent> -#include <QtCore/QDebug> +#include <QMouseEvent> +#include <QDebug> namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljscontextcrumblepath.h b/src/plugins/qmljsinspector/qmljscontextcrumblepath.h index 4f98165b36..321425c5e8 100644 --- a/src/plugins/qmljsinspector/qmljscontextcrumblepath.h +++ b/src/plugins/qmljsinspector/qmljscontextcrumblepath.h @@ -33,7 +33,7 @@ #define QMLJSCONTEXTCRUMBLEPATH_H #include <utils/crumblepath.h> -#include <QtCore/QStringList> +#include <QStringList> namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index ebe3cb2076..8a9912c494 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -86,26 +86,26 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QTimer> -#include <QtCore/QtPlugin> -#include <QtCore/QDateTime> - -#include <QtGui/QLabel> -#include <QtGui/QDockWidget> -#include <QtGui/QVBoxLayout> -#include <QtGui/QAction> -#include <QtGui/QLineEdit> -#include <QtGui/QLabel> -#include <QtGui/QPainter> -#include <QtGui/QSpinBox> -#include <QtGui/QMessageBox> -#include <QtGui/QTextBlock> - -#include <QtGui/QToolTip> -#include <QtGui/QCursor> -#include <QtNetwork/QHostAddress> +#include <QDebug> +#include <QStringList> +#include <QTimer> +#include <QtPlugin> +#include <QDateTime> + +#include <QLabel> +#include <QDockWidget> +#include <QVBoxLayout> +#include <QAction> +#include <QLineEdit> +#include <QLabel> +#include <QPainter> +#include <QSpinBox> +#include <QMessageBox> +#include <QTextBlock> + +#include <QToolTip> +#include <QCursor> +#include <QHostAddress> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljsinspector/qmljsinspector.h b/src/plugins/qmljsinspector/qmljsinspector.h index 477d331065..6a9544f55a 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.h +++ b/src/plugins/qmljsinspector/qmljsinspector.h @@ -41,8 +41,8 @@ #include <qmljs/qmljsdocument.h> #include <qmljs/parser/qmljsastfwd_p.h> -#include <QtGui/QAction> -#include <QtCore/QObject> +#include <QAction> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QLineEdit) diff --git a/src/plugins/qmljsinspector/qmljsinspector_global.h b/src/plugins/qmljsinspector/qmljsinspector_global.h index 630e2c35a3..897c08f7fd 100644 --- a/src/plugins/qmljsinspector/qmljsinspector_global.h +++ b/src/plugins/qmljsinspector/qmljsinspector_global.h @@ -32,7 +32,7 @@ #ifndef QMLINSPECTOR_GLOBAL_H #define QMLINSPECTOR_GLOBAL_H -#include <QtCore/QtGlobal> +#include <QtGlobal> #if defined(QMLJSINSPECTOR_LIBRARY) # define QMLINSPECTOR_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/qmljsinspector/qmljsinspectorclient.cpp b/src/plugins/qmljsinspector/qmljsinspectorclient.cpp index bba7ffe607..d4bf615c8c 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorclient.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorclient.cpp @@ -33,7 +33,7 @@ #include "qmljsclientproxy.h" #include "qmljsinspectorconstants.h" -#include <QtGui/QColor> +#include <QColor> using namespace QmlJSDebugger; diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp index 386e66109f..8378c1b300 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp @@ -49,14 +49,14 @@ #include <qmlprojectmanager/qmlproject.h> #include <utils/qtcassert.h> -#include <QtCore/QStringList> -#include <QtCore/QtPlugin> -#include <QtCore/QTimer> +#include <QStringList> +#include <QtPlugin> +#include <QTimer> -#include <QtGui/QHBoxLayout> -#include <QtGui/QToolButton> +#include <QHBoxLayout> +#include <QToolButton> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJSInspector::Internal; using namespace QmlJSInspector::Constants; diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.h b/src/plugins/qmljsinspector/qmljsinspectorplugin.h index 3b1c875215..34bedf6d65 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorplugin.h +++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.h @@ -35,9 +35,9 @@ #include <extensionsystem/iplugin.h> #include <qmljs/qmljsmodelmanagerinterface.h> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QTimer> +#include <QObject> +#include <QPointer> +#include <QTimer> namespace Core { class IMode; diff --git a/src/plugins/qmljsinspector/qmljsinspectorsettings.cpp b/src/plugins/qmljsinspector/qmljsinspectorsettings.cpp index a10d456eb2..ac9a8bf90b 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorsettings.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorsettings.cpp @@ -32,7 +32,7 @@ #include "qmljsinspectorsettings.h" #include "qmljsinspectorconstants.h" -#include <QtCore/QSettings> +#include <QSettings> namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljsinspectorsettings.h b/src/plugins/qmljsinspector/qmljsinspectorsettings.h index fcfb09e4af..1eb5ffdec2 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorsettings.h +++ b/src/plugins/qmljsinspector/qmljsinspectorsettings.h @@ -33,7 +33,7 @@ #ifndef INSPECTORSETTINGS_H #define INSPECTORSETTINGS_H -#include <QtCore/QObject> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QSettings) diff --git a/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp index ec64ca80fa..88a015adf2 100644 --- a/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp @@ -47,12 +47,12 @@ #include <utils/styledbar.h> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QHBoxLayout> -#include <QtGui/QMenu> -#include <QtGui/QToolButton> -#include <QtGui/QLineEdit> +#include <QAction> +#include <QActionGroup> +#include <QHBoxLayout> +#include <QMenu> +#include <QToolButton> +#include <QLineEdit> namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljsinspectortoolbar.h b/src/plugins/qmljsinspector/qmljsinspectortoolbar.h index f2cee71794..b533c38de6 100644 --- a/src/plugins/qmljsinspector/qmljsinspectortoolbar.h +++ b/src/plugins/qmljsinspector/qmljsinspectortoolbar.h @@ -35,8 +35,8 @@ #include <debugger/debuggerconstants.h> -#include <QtCore/QObject> -#include <QtGui/QIcon> +#include <QObject> +#include <QIcon> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp index 6c33fadcb7..dee2e8a435 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp @@ -54,7 +54,7 @@ #include <debugger/debuggerconstants.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.h b/src/plugins/qmljsinspector/qmljslivetextpreview.h index fe2d1b1cd7..661b2d0e77 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.h +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.h @@ -33,8 +33,8 @@ #ifndef SCRIPTBINDINGREWRITER_H #define SCRIPTBINDINGREWRITER_H -#include <QtCore/QObject> -#include <QtCore/QWeakPointer> +#include <QObject> +#include <QWeakPointer> #include <qmljs/parser/qmljsastfwd_p.h> #include <qmljs/qmljsdocument.h> diff --git a/src/plugins/qmljsinspector/qmljspropertyinspector.cpp b/src/plugins/qmljsinspector/qmljspropertyinspector.cpp index 58c9d0fca5..4ee78abf2a 100644 --- a/src/plugins/qmljsinspector/qmljspropertyinspector.cpp +++ b/src/plugins/qmljsinspector/qmljspropertyinspector.cpp @@ -31,19 +31,19 @@ **************************************************************************/ #include "qmljspropertyinspector.h" -#include <QtGui/QHeaderView> -#include <QtGui/QItemDelegate> -#include <QtGui/QLineEdit> -#include <QtGui/QDoubleValidator> -#include <QtGui/QPainter> +#include <QHeaderView> +#include <QItemDelegate> +#include <QLineEdit> +#include <QDoubleValidator> +#include <QPainter> // expression editor -#include <QtGui/QContextMenuEvent> -#include <QtGui/QVBoxLayout> +#include <QContextMenuEvent> +#include <QVBoxLayout> // context menu -#include <QtGui/QAction> -#include <QtGui/QMenu> +#include <QAction> +#include <QMenu> #include <utils/qtcassert.h> diff --git a/src/plugins/qmljsinspector/qmljspropertyinspector.h b/src/plugins/qmljsinspector/qmljspropertyinspector.h index 4cd98b4e2f..31fe1d61b6 100644 --- a/src/plugins/qmljsinspector/qmljspropertyinspector.h +++ b/src/plugins/qmljsinspector/qmljspropertyinspector.h @@ -33,12 +33,12 @@ #define PROPERTYINSPECTOR_H #include <qmljsprivateapi.h> -#include <QtGui/QTreeView> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> +#include <QTreeView> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> +#include <QDialog> +#include <QDialogButtonBox> #include "customcolordialog.h" diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp index 5e7a78b279..b16fa40771 100644 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp +++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp @@ -31,18 +31,18 @@ **************************************************************************/ #include "qmljstoolbarcolorbox.h" -#include <QtGui/QPixmap> -#include <QtGui/QPainter> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QClipboard> -#include <QtGui/QApplication> -#include <QtGui/QColorDialog> -#include <QtGui/QDrag> - -#include <QtCore/QMimeData> -#include <QtCore/QDebug> +#include <QPixmap> +#include <QPainter> +#include <QMenu> +#include <QAction> +#include <QContextMenuEvent> +#include <QClipboard> +#include <QApplication> +#include <QColorDialog> +#include <QDrag> + +#include <QMimeData> +#include <QDebug> namespace QmlJSInspector { diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h index bdc30b65a7..449804d139 100644 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h +++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h @@ -32,9 +32,9 @@ #ifndef TOOLBARCOLORBOX_H #define TOOLBARCOLORBOX_H -#include <QtGui/QLabel> -#include <QtGui/QColor> -#include <QtCore/QPoint> +#include <QLabel> +#include <QColor> +#include <QPoint> QT_FORWARD_DECLARE_CLASS(QContextMenuEvent) QT_FORWARD_DECLARE_CLASS(QAction) diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp index c77d63e017..5bdd9427ca 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp @@ -39,7 +39,7 @@ #include <texteditor/snippets/isnippetprovider.h> #include <extensionsystem/pluginmanager.h> #include <qmljseditor/qmljseditorconstants.h> -#include <QtGui/QLayout> +#include <QLayout> using namespace QmlJSTools; diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index 4d93b32d73..16131e1269 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -49,7 +49,7 @@ #include <qmljseditor/qmljseditorconstants.h> #include <coreplugin/icore.h> -#include <QtCore/QTextStream> +#include <QTextStream> using namespace TextEditor; diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.h b/src/plugins/qmljstools/qmljscodestylesettingspage.h index b33f71ca89..1e3de252e5 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.h +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.h @@ -34,8 +34,8 @@ #define QMLJSCODESTYLESETTINGSPAGE_H #include <coreplugin/dialogs/ioptionspage.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp index ef0ee71f67..e10c15e4e8 100644 --- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp +++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp @@ -48,7 +48,7 @@ #include <cplusplus/ModelManagerInterface.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJSTools; diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.h b/src/plugins/qmljstools/qmljsfindexportedcpptypes.h index bf453f34b6..0379942cb1 100644 --- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.h +++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.h @@ -36,8 +36,8 @@ #include <cplusplus/CppDocument.h> #include <languageutils/fakemetaobject.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QHash> +#include <QCoreApplication> +#include <QHash> namespace QmlJSTools { diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index b122807951..b48f4c3bf8 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -36,7 +36,7 @@ #include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h> -#include <QtCore/QStringMatcher> +#include <QStringMatcher> using namespace QmlJSTools::Internal; diff --git a/src/plugins/qmljstools/qmljsindenter.cpp b/src/plugins/qmljstools/qmljsindenter.cpp index d746a5f9cc..6c40027fbd 100644 --- a/src/plugins/qmljstools/qmljsindenter.cpp +++ b/src/plugins/qmljstools/qmljsindenter.cpp @@ -35,10 +35,10 @@ #include <qmljstools/qmljsqtstylecodeformatter.h> #include <texteditor/tabsettings.h> -#include <QtCore/QChar> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> +#include <QChar> +#include <QTextDocument> +#include <QTextBlock> +#include <QTextCursor> using namespace QmlJSEditor; using namespace Internal; diff --git a/src/plugins/qmljstools/qmljslocatordata.cpp b/src/plugins/qmljstools/qmljslocatordata.cpp index 3860935bf3..b1b0e896f3 100644 --- a/src/plugins/qmljstools/qmljslocatordata.cpp +++ b/src/plugins/qmljstools/qmljslocatordata.cpp @@ -37,7 +37,7 @@ //#include <qmljs/qmljsinterpreter.h> #include <qmljs/parser/qmljsast_p.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace QmlJSTools::Internal; using namespace QmlJS; diff --git a/src/plugins/qmljstools/qmljslocatordata.h b/src/plugins/qmljstools/qmljslocatordata.h index c9210c7194..f63deb3e07 100644 --- a/src/plugins/qmljstools/qmljslocatordata.h +++ b/src/plugins/qmljstools/qmljslocatordata.h @@ -35,8 +35,8 @@ #include <qmljs/qmljsdocument.h> -#include <QtCore/QObject> -#include <QtCore/QHash> +#include <QObject> +#include <QHash> namespace QmlJSTools { namespace Internal { diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 04f2a0d2cf..e7e5346dee 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -53,17 +53,17 @@ #include <projectexplorer/session.h> #include <qtsupport/baseqtversion.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QLibraryInfo> -#include <QtCore/QtConcurrentRun> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QLibraryInfo> +#include <QtConcurrentRun> #include <utils/runextensions.h> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> -#include <QtCore/QTimer> +#include <QTextStream> +#include <QCoreApplication> +#include <QTimer> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlJSTools; diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h index 9d0c0f6b60..6973f7ffd6 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.h +++ b/src/plugins/qmljstools/qmljsmodelmanager.h @@ -39,9 +39,9 @@ #include <cplusplus/CppDocument.h> -#include <QtCore/QFuture> -#include <QtCore/QFutureSynchronizer> -#include <QtCore/QMutex> +#include <QFuture> +#include <QFutureSynchronizer> +#include <QMutex> QT_FORWARD_DECLARE_CLASS(QTimer) diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp index 34a7bd759c..f976aa61de 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.cpp +++ b/src/plugins/qmljstools/qmljsplugindumper.cpp @@ -40,8 +40,8 @@ #include <utils/filesystemwatcher.h> #include <utils/fileutils.h> -#include <QtCore/QMetaType> -#include <QtCore/QDir> +#include <QMetaType> +#include <QDir> using namespace LanguageUtils; using namespace QmlJS; diff --git a/src/plugins/qmljstools/qmljsplugindumper.h b/src/plugins/qmljstools/qmljsplugindumper.h index b280759a70..8a5073f32e 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.h +++ b/src/plugins/qmljstools/qmljsplugindumper.h @@ -35,9 +35,9 @@ #include <qmljs/qmljsmodelmanagerinterface.h> -#include <QtCore/QObject> -#include <QtCore/QHash> -#include <QtCore/QProcess> +#include <QObject> +#include <QHash> +#include <QProcess> QT_BEGIN_NAMESPACE class QDir; diff --git a/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp b/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp index 391fd5b961..e173e71dc7 100644 --- a/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp +++ b/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp @@ -34,7 +34,7 @@ #include <texteditor/tabsettings.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlJSTools; diff --git a/src/plugins/qmljstools/qmljstoolsconstants.h b/src/plugins/qmljstools/qmljstoolsconstants.h index be94b98230..e04cc7a0e0 100644 --- a/src/plugins/qmljstools/qmljstoolsconstants.h +++ b/src/plugins/qmljstools/qmljstoolsconstants.h @@ -33,7 +33,7 @@ #ifndef QMLJSTOOLS_CONSTANTS_H #define QMLJSTOOLS_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace QmlJSTools { namespace Constants { diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index 9ce39fc21f..f395e23630 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -47,12 +47,12 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <QtCore/QtPlugin> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtGui/QMenu> +#include <QtPlugin> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QSettings> +#include <QMenu> using namespace QmlJSTools::Internal; diff --git a/src/plugins/qmljstools/qmljstoolsplugin.h b/src/plugins/qmljstools/qmljstoolsplugin.h index a7eac72f7d..f35917fd4d 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.h +++ b/src/plugins/qmljstools/qmljstoolsplugin.h @@ -36,8 +36,8 @@ #include <extensionsystem/iplugin.h> #include <projectexplorer/projectexplorer.h> -#include <QtGui/QTextDocument> -#include <QtCore/QSharedPointer> +#include <QTextDocument> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QFileInfo; diff --git a/src/plugins/qmljstools/qmljstoolssettings.cpp b/src/plugins/qmljstools/qmljstoolssettings.cpp index b94cc88731..0ac3c604e9 100644 --- a/src/plugins/qmljstools/qmljstoolssettings.cpp +++ b/src/plugins/qmljstools/qmljstoolssettings.cpp @@ -43,7 +43,7 @@ #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtCore/QSettings> +#include <QSettings> static const char *idKey = "QmlJSGlobal"; diff --git a/src/plugins/qmljstools/qmljstoolssettings.h b/src/plugins/qmljstools/qmljstoolssettings.h index eed485f325..42cc5f1988 100644 --- a/src/plugins/qmljstools/qmljstoolssettings.h +++ b/src/plugins/qmljstools/qmljstoolssettings.h @@ -35,7 +35,7 @@ #include "qmljstools_global.h" -#include <QtCore/QObject> +#include <QObject> namespace TextEditor { diff --git a/src/plugins/qmlprofiler/abstractqmlprofilerrunner.h b/src/plugins/qmlprofiler/abstractqmlprofilerrunner.h index 5e5f9180d7..ace4c28a51 100644 --- a/src/plugins/qmlprofiler/abstractqmlprofilerrunner.h +++ b/src/plugins/qmlprofiler/abstractqmlprofilerrunner.h @@ -33,7 +33,7 @@ #ifndef ABSTRACTQMLPROFILERRUNNER_H #define ABSTRACTQMLPROFILERRUNNER_H -#include <QtCore/QObject> +#include <QObject> #include <utils/outputformat.h> namespace QmlProfiler { diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp b/src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp index 33aa905e3e..96dd525c15 100644 --- a/src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp +++ b/src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp @@ -34,7 +34,7 @@ #include "qdeclarativecanvastimer_p.h" #include "qdeclarativecontext2d_p.h" -#include <QtGui/qpainter.h> +#include <qpainter.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h b/src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h index f923284aee..acc5315faf 100644 --- a/src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h +++ b/src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h @@ -33,7 +33,7 @@ #ifndef QDECLARATIVECANVAS_P_H #define QDECLARATIVECANVAS_P_H -#include <QtDeclarative/qdeclarativeitem.h> +#include <qdeclarativeitem.h> #include "qdeclarativecontext2d_p.h" #include "qdeclarativecanvastimer_p.h" diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp index 4419db81f3..1ddc5a0a6b 100644 --- a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp +++ b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp @@ -30,9 +30,9 @@ ** **************************************************************************/ -#include <QtScript/qscriptengine.h> -#include <QtScript/qscriptvalue.h> -#include <QtCore/qtimer.h> +#include <qscriptengine.h> +#include <qscriptvalue.h> +#include <qtimer.h> #include "qdeclarativecanvastimer_p.h" diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h index c99a5946d9..330e19aaed 100644 --- a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h +++ b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer_p.h @@ -33,9 +33,9 @@ #ifndef QDECLARATIVECANVASTIMER_P_H #define QDECLARATIVECANVASTIMER_P_H -#include <QtScript/qscriptvalue.h> -#include <QtCore/qtimer.h> -#include <QtCore/qlist.h> +#include <qscriptvalue.h> +#include <qtimer.h> +#include <qlist.h> QT_BEGIN_HEADER diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp b/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp index 641eb74910..56e3433fca 100644 --- a/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp +++ b/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp @@ -34,14 +34,14 @@ #include "qdeclarativecanvas_p.h" -#include <QtCore/qdebug.h> +#include <qdebug.h> #include <math.h> -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qapplication.h> -#include <QtGui/qgraphicseffect.h> +#include <qgraphicsitem.h> +#include <qapplication.h> +#include <qgraphicseffect.h> -#include <QtGui/QImage> +#include <QImage> QT_BEGIN_NAMESPACE diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h b/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h index 730eae3319..b3c740e200 100644 --- a/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h +++ b/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h @@ -33,15 +33,15 @@ #ifndef QDECLARATIVECONTEXT2D_P_H #define QDECLARATIVECONTEXT2D_P_H -#include <QtGui/qpainter.h> -#include <QtGui/qpainterpath.h> -#include <QtGui/qpixmap.h> -#include <QtCore/qstring.h> -#include <QtCore/qstack.h> -#include <QtCore/qmetatype.h> -#include <QtCore/qcoreevent.h> -#include <QtCore/qvariant.h> -#include <QtScript/qscriptvalue.h> +#include <qpainter.h> +#include <qpainterpath.h> +#include <qpixmap.h> +#include <qstring.h> +#include <qstack.h> +#include <qmetatype.h> +#include <qcoreevent.h> +#include <qvariant.h> +#include <qscriptvalue.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp b/src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp index f1d7f0bd35..86e6961537 100644 --- a/src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp +++ b/src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp @@ -34,8 +34,8 @@ #include "qdeclarativecontext2d_p.h" -#include <QtGui/qpixmap.h> -#include <QtGui/qpainter.h> +#include <qpixmap.h> +#include <qpainter.h> namespace QmlProfiler { namespace Internal { diff --git a/src/plugins/qmlprofiler/canvas/qmlprofilercanvas.h b/src/plugins/qmlprofiler/canvas/qmlprofilercanvas.h index 5b8ab3fb4a..e984716621 100644 --- a/src/plugins/qmlprofiler/canvas/qmlprofilercanvas.h +++ b/src/plugins/qmlprofiler/canvas/qmlprofilercanvas.h @@ -33,7 +33,7 @@ #ifndef QMLPROFILERCANVAS_H #define QMLPROFILERCANVAS_H -#include <QtDeclarative/QDeclarativeItem> +#include <QDeclarativeItem> QT_BEGIN_NAMESPACE class Context2D; diff --git a/src/plugins/qmlprofiler/qmlprofiler_global.h b/src/plugins/qmlprofiler/qmlprofiler_global.h index 3d01c8bbed..309302cc65 100644 --- a/src/plugins/qmlprofiler/qmlprofiler_global.h +++ b/src/plugins/qmlprofiler/qmlprofiler_global.h @@ -33,7 +33,7 @@ #ifndef QMLPROFILER_GLOBAL_H #define QMLPROFILER_GLOBAL_H -#include <QtCore/QtGlobal> +#include <QtGlobal> #if defined(QMLPROFILERPLUGIN_LIBRARY) # define QMLPROFILERPLUGINSHARED_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h index fde05f1b09..561717c890 100644 --- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h +++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h @@ -33,7 +33,7 @@ #ifndef QMLPROFILERDETAILSREWRITER_H #define QMLPROFILERDETAILSREWRITER_H -#include <QtCore/QObject> +#include <QObject> #include "qmljsdebugclient/qmlprofilereventlocation.h" #include <qmljs/qmljsdocument.h> diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index 2f446f6c55..f485dec462 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -50,9 +50,9 @@ #include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h> #include <qmljsdebugclient/qdeclarativeoutputparser.h> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtCore/QTimer> +#include <QMainWindow> +#include <QMessageBox> +#include <QTimer> using namespace Analyzer; using namespace ProjectExplorer; diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp index 57eb3d4fa2..869f0572de 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp @@ -32,21 +32,21 @@ #include "qmlprofilereventview.h" -#include <QtCore/QUrl> -#include <QtCore/QHash> +#include <QUrl> +#include <QHash> -#include <QtGui/QStandardItem> -#include <QtGui/QHeaderView> +#include <QStandardItem> +#include <QHeaderView> -#include <QtGui/QApplication> -#include <QtGui/QClipboard> +#include <QApplication> +#include <QClipboard> -#include <QtGui/QContextMenuEvent> +#include <QContextMenuEvent> #include <QDebug> #include <coreplugin/minisplitter.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> +#include <QVBoxLayout> +#include <QHBoxLayout> using namespace QmlJsDebugClient; diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.h b/src/plugins/qmlprofiler/qmlprofilereventview.h index 73c700245f..797dc80609 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.h +++ b/src/plugins/qmlprofiler/qmlprofilereventview.h @@ -33,10 +33,10 @@ #ifndef QMLPROFILEREVENTVIEW_H #define QMLPROFILEREVENTVIEW_H -#include <QtGui/QTreeView> +#include <QTreeView> #include <qmljsdebugclient/qmlprofilereventtypes.h> #include <qmljsdebugclient/qmlprofilereventlist.h> -#include <QtGui/QStandardItemModel> +#include <QStandardItemModel> namespace QmlProfiler { namespace Internal { diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp index e3d4524b02..e0a477d853 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp @@ -36,7 +36,7 @@ #include <analyzerbase/analyzermanager.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> using namespace Analyzer; using namespace QmlProfiler::Internal; diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index db83c27851..0e10042c29 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -82,17 +82,17 @@ #include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h> #include <qt4projectmanager/qt-s60/s60deployconfiguration.h> -#include <QtCore/QFile> - -#include <QtGui/QApplication> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QTabWidget> -#include <QtGui/QToolButton> -#include <QtGui/QMessageBox> -#include <QtGui/QDockWidget> -#include <QtGui/QFileDialog> -#include <QtGui/QMenu> +#include <QFile> + +#include <QApplication> +#include <QHBoxLayout> +#include <QLabel> +#include <QTabWidget> +#include <QToolButton> +#include <QMessageBox> +#include <QDockWidget> +#include <QFileDialog> +#include <QMenu> using namespace Core; using namespace Core::Constants; diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h index 6bdb1dbd38..728496c634 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.h +++ b/src/plugins/qmlprofiler/qmlprofilertool.h @@ -36,7 +36,7 @@ #include <analyzerbase/ianalyzertool.h> #include <analyzerbase/ianalyzerengine.h> -#include <QtCore/QPoint> +#include <QPoint> namespace QmlProfiler { namespace Internal { diff --git a/src/plugins/qmlprofiler/timelineview.cpp b/src/plugins/qmlprofiler/timelineview.cpp index 3fd0d4c07d..1e10eb0075 100644 --- a/src/plugins/qmlprofiler/timelineview.cpp +++ b/src/plugins/qmlprofiler/timelineview.cpp @@ -34,10 +34,10 @@ #include <qdeclarativecontext.h> #include <qdeclarativeproperty.h> -#include <QtCore/QTimer> -#include <QtGui/QPixmap> -#include <QtGui/QPainter> -#include <QtGui/QGraphicsSceneMouseEvent> +#include <QTimer> +#include <QPixmap> +#include <QPainter> +#include <QGraphicsSceneMouseEvent> #include <math.h> diff --git a/src/plugins/qmlprofiler/timelineview.h b/src/plugins/qmlprofiler/timelineview.h index dcb3bbfc3f..357662ea3e 100644 --- a/src/plugins/qmlprofiler/timelineview.h +++ b/src/plugins/qmlprofiler/timelineview.h @@ -33,8 +33,8 @@ #ifndef TIMELINEVIEW_H #define TIMELINEVIEW_H -#include <QtDeclarative/QDeclarativeItem> -#include <QtScript/QScriptValue> +#include <QDeclarativeItem> +#include <QScriptValue> #include <qmljsdebugclient/qmlprofilereventlist.h> namespace QmlProfiler { diff --git a/src/plugins/qmlprofiler/tracewindow.cpp b/src/plugins/qmlprofiler/tracewindow.cpp index 93874dda04..22e481e60f 100644 --- a/src/plugins/qmlprofiler/tracewindow.cpp +++ b/src/plugins/qmlprofiler/tracewindow.cpp @@ -38,14 +38,14 @@ #include <qmljsdebugclient/qmlprofilertraceclient.h> #include <utils/styledbar.h> -#include <QtDeclarative/QDeclarativeView> -#include <QtDeclarative/QDeclarativeContext> -#include <QtGui/QVBoxLayout> -#include <QtGui/QGraphicsObject> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QScrollBar> -#include <QtGui/QSlider> -#include <QtGui/QWidget> +#include <QDeclarativeView> +#include <QDeclarativeContext> +#include <QVBoxLayout> +#include <QGraphicsObject> +#include <QContextMenuEvent> +#include <QScrollBar> +#include <QSlider> +#include <QWidget> #include <math.h> diff --git a/src/plugins/qmlprofiler/tracewindow.h b/src/plugins/qmlprofiler/tracewindow.h index 4b0d9c7f14..b357d1e603 100644 --- a/src/plugins/qmlprofiler/tracewindow.h +++ b/src/plugins/qmlprofiler/tracewindow.h @@ -38,12 +38,12 @@ #include "qmlprofilerdetailsrewriter.h" #include <qmljsdebugclient/qv8profilerclient.h> -#include <QtCore/QPointer> -#include <QtGui/QWidget> -#include <QtGui/QToolButton> +#include <QPointer> +#include <QWidget> +#include <QToolButton> -#include <QtCore/QEvent> -#include <QtDeclarative/QDeclarativeView> +#include <QEvent> +#include <QDeclarativeView> namespace QmlProfiler { namespace Internal { diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index f14cb84f70..3dfc088d0f 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp @@ -35,9 +35,9 @@ #include <utils/filesystemwatcher.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtGui/QImageReader> +#include <QDebug> +#include <QDir> +#include <QImageReader> namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h index 38e768205d..7f705a8cfb 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h @@ -35,11 +35,11 @@ #include "qmlprojectitem.h" -#include <QtCore/QObject> -#include <QtCore/QSet> -#include <QtCore/QTimer> +#include <QObject> +#include <QSet> +#include <QTimer> -#include <QtDeclarative/qdeclarative.h> +#include <qdeclarative.h> QT_FORWARD_DECLARE_CLASS(QDir) diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp index 65b2e51fe4..e97a07e7f0 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp @@ -33,8 +33,8 @@ #include "qmlprojectitem.h" #include "filefilteritems.h" -#include <QtCore/QDebug> -#include <QtCore/QDir> +#include <QDebug> +#include <QDir> namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h index ea7639ce85..13ca34d725 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h @@ -33,9 +33,9 @@ #ifndef QMLPROJECTITEM_H #define QMLPROJECTITEM_H -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtDeclarative/qdeclarative.h> +#include <QObject> +#include <QStringList> +#include <qdeclarative.h> namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index a3f1f48a31..64b84d90dc 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -52,9 +52,9 @@ #include <projectexplorer/toolchainmanager.h> #include <utils/filesystemwatcher.h> -#include <QtCore/QTextStream> -#include <QtDeclarative/QDeclarativeComponent> -#include <QtCore/QtDebug> +#include <QTextStream> +#include <QDeclarativeComponent> +#include <QtDebug> namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index e56e60e667..0787ec97f7 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -37,7 +37,7 @@ #include <projectexplorer/project.h> -#include <QtDeclarative/QDeclarativeEngine> +#include <QDeclarativeEngine> namespace QmlJS { class ModelManagerInterface; diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp index 30a9003d31..b76d72ded3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp @@ -39,14 +39,14 @@ #include <projectexplorer/projectexplorerconstants.h> #include <qtsupport/qtsupportconstants.h> -#include <QtGui/QIcon> +#include <QIcon> -#include <QtGui/QPainter> -#include <QtGui/QPixmap> +#include <QPainter> +#include <QPixmap> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QTextStream> +#include <QCoreApplication> namespace QmlProjectManager { namespace Internal { diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro index d328ba303b..4885be0441 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = QmlProjectManager -QT += declarative +QT += declarative network include(../../qtcreatorplugin.pri) include(qmlprojectmanager_dependencies.pri) diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager_global.h b/src/plugins/qmlprojectmanager/qmlprojectmanager_global.h index b7a3f4755d..cf3187e47b 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager_global.h +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager_global.h @@ -33,7 +33,7 @@ #ifndef QMLPROJECTMANAGER_GLOBAL_H #define QMLPROJECTMANAGER_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(QMLPROJECTMANAGER_LIBRARY) # define QMLPROJECTMANAGER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp index 2cd79a0a46..f40a20f069 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp @@ -38,10 +38,10 @@ #include <coreplugin/fileiconprovider.h> #include <projectexplorer/projectexplorer.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtGui/QStyle> +#include <QFileInfo> +#include <QDir> +#include <QTextStream> +#include <QStyle> namespace QmlProjectManager { namespace Internal { diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h index 5c4a3e6920..fdcb6e127c 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h @@ -35,8 +35,8 @@ #include <projectexplorer/projectnodes.h> -#include <QtCore/QStringList> -#include <QtCore/QHash> +#include <QStringList> +#include <QHash> namespace Core { class IFile; diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index ec92aa0cc3..ee95878663 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -53,11 +53,11 @@ #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QtPlugin> +#include <QtPlugin> -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QApplication> +#include <QMessageBox> +#include <QPushButton> namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index 6e4c99120e..97f2975837 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -37,7 +37,7 @@ #include <projectexplorer/runconfiguration.h> -#include <QtCore/QWeakPointer> +#include <QWeakPointer> QT_FORWARD_DECLARE_CLASS(QStringListModel) diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp index 83ec0431b0..8167e4d53a 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp @@ -47,12 +47,12 @@ #include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtversionmanager.h> -#include <QtGui/QLineEdit> -#include <QtGui/QComboBox> -#include <QtGui/QFormLayout> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QStandardItemModel> +#include <QLineEdit> +#include <QComboBox> +#include <QFormLayout> +#include <QLabel> +#include <QPushButton> +#include <QStandardItemModel> using Core::ICore; using Utils::DebuggerLanguageChooser; diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h index 7587557275..1b71dfd008 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h @@ -33,7 +33,7 @@ #ifndef QMLPROJECTRUNCONFIGURATIONWIDGET_H #define QMLPROJECTRUNCONFIGURATIONWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QComboBox) QT_FORWARD_DECLARE_CLASS(QStandardItemModel) diff --git a/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp b/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp index a05774ca4f..1d4411b150 100644 --- a/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp @@ -36,9 +36,9 @@ #include "qmlprojectmanagerconstants.h" #include "qmlprojectrunconfiguration.h" -#include <QtCore/QDebug> -#include <QtGui/QApplication> -#include <QtGui/QStyle> +#include <QDebug> +#include <QApplication> +#include <QStyle> namespace QmlProjectManager { namespace Internal { diff --git a/src/plugins/qmlprojectmanager/qmlprojecttarget.h b/src/plugins/qmlprojectmanager/qmlprojecttarget.h index c280958e87..5e388d23e3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojecttarget.h +++ b/src/plugins/qmlprojectmanager/qmlprojecttarget.h @@ -35,8 +35,8 @@ #include <projectexplorer/target.h> -#include <QtCore/QStringList> -#include <QtCore/QVariantMap> +#include <QStringList> +#include <QVariantMap> namespace QmlProjectManager { class QmlProject; diff --git a/src/plugins/qt4projectmanager/addlibrarywizard.cpp b/src/plugins/qt4projectmanager/addlibrarywizard.cpp index d02d33b5b2..ecf4681e1c 100644 --- a/src/plugins/qt4projectmanager/addlibrarywizard.cpp +++ b/src/plugins/qt4projectmanager/addlibrarywizard.cpp @@ -34,12 +34,12 @@ #include "ui_librarydetailswidget.h" #include "librarydetailscontroller.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QRadioButton> -#include <QtGui/QLabel> +#include <QVBoxLayout> +#include <QRadioButton> +#include <QLabel> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QFileInfo> +#include <QDebug> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/applicationlauncher.h b/src/plugins/qt4projectmanager/applicationlauncher.h index 53339ba0e6..b88be2817f 100644 --- a/src/plugins/qt4projectmanager/applicationlauncher.h +++ b/src/plugins/qt4projectmanager/applicationlauncher.h @@ -33,9 +33,9 @@ #ifndef APPLICATIONLAUNCHER_H #define APPLICATIONLAUNCHER_H -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QProcess> +#include <QObject> +#include <QStringList> +#include <QProcess> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp index 5489dcead7..e32917ecdc 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp @@ -32,8 +32,8 @@ #include "classdefinition.h" -#include <QtCore/QFileInfo> -#include <QtGui/QFileDialog> +#include <QFileInfo> +#include <QFileDialog> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h index 057e3fd653..1ca21fad7a 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h @@ -37,7 +37,7 @@ #include "filenamingparameters.h" #include "pluginoptions.h" -#include <QtGui/QTabWidget> +#include <QTabWidget> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp index b6da9fff27..d60e4181f3 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp @@ -34,15 +34,15 @@ #include <utils/qtcassert.h> -#include <QtGui/QKeyEvent> -#include <QtGui/QMessageBox> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> - -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QKeyEvent> +#include <QMessageBox> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QLabel> +#include <QToolButton> + +#include <QDebug> +#include <QRegExp> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h index 103eb55d91..1c4d9a41f8 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h @@ -33,7 +33,7 @@ #ifndef CLASSLIST_H #define CLASSLIST_H -#include <QtGui/QListView> +#include <QListView> QT_FORWARD_DECLARE_CLASS(QModelIndex) diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h index a4b2a19690..3001fd4403 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h @@ -35,8 +35,8 @@ #include "filenamingparameters.h" -#include <QtGui/QWizardPage> -#include <QtCore/QSharedPointer> +#include <QWizardPage> +#include <QSharedPointer> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp index 023ee60d92..fd98fe1721 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp @@ -37,11 +37,11 @@ #include <coreplugin/coreconstants.h> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> +#include <QFileInfo> +#include <QTimer> -#include <QtGui/QStackedLayout> -#include <QtGui/QIcon> +#include <QStackedLayout> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h index c09a08668f..65761d7f5e 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h @@ -36,8 +36,8 @@ #include "pluginoptions.h" #include "filenamingparameters.h" -#include <QtCore/QList> -#include <QtGui/QWizardPage> +#include <QList> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QStackedLayout; diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp index 9547307dfc..bb03038198 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp @@ -40,7 +40,7 @@ #include <qtsupport/qtsupportconstants.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h index 7d13215d4e..ff9cfd0da2 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h @@ -35,7 +35,7 @@ #include "../wizards/qtwizard.h" -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h b/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h index 43e2ef57c2..9ee24ec736 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h @@ -33,8 +33,8 @@ #ifndef FILENAMINGPARAMETERS_H #define FILENAMINGPARAMETERS_H -#include <QtCore/QString> -#include <QtCore/QFileInfo> +#include <QString> +#include <QFileInfo> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp index d3500e92b2..ef3b72ae3f 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp @@ -39,9 +39,9 @@ #include <cpptools/abstracteditorsupport.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QSet> +#include <QFileInfo> +#include <QDir> +#include <QSet> static QString headerGuard(const QString &header) { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h index dc6f7d40a5..a0ad14b074 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h @@ -33,10 +33,10 @@ #ifndef PLUGINGENERATOR_H #define PLUGINGENERATOR_H -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QMap> +#include <QObject> +#include <QString> +#include <QList> +#include <QMap> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h b/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h index ddea89ae27..b89dacc55b 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h @@ -33,8 +33,8 @@ #ifndef PLUGINOPTIONS_H #define PLUGINOPTIONS_H -#include <QtCore/QString> -#include <QtCore/QList> +#include <QString> +#include <QList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/externaleditors.cpp b/src/plugins/qt4projectmanager/externaleditors.cpp index 64f3a85c4b..fc02094407 100644 --- a/src/plugins/qt4projectmanager/externaleditors.cpp +++ b/src/plugins/qt4projectmanager/externaleditors.cpp @@ -42,13 +42,13 @@ #include <qtsupport/qtversionmanager.h> #include <designer/designerconstants.h> -#include <QtCore/QProcess> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QSignalMapper> +#include <QProcess> +#include <QFileInfo> +#include <QDebug> +#include <QSignalMapper> -#include <QtNetwork/QTcpSocket> -#include <QtNetwork/QTcpServer> +#include <QTcpSocket> +#include <QTcpServer> enum { debug = 0 }; diff --git a/src/plugins/qt4projectmanager/externaleditors.h b/src/plugins/qt4projectmanager/externaleditors.h index af04346a43..fe20eb8116 100644 --- a/src/plugins/qt4projectmanager/externaleditors.h +++ b/src/plugins/qt4projectmanager/externaleditors.h @@ -36,8 +36,8 @@ #include <coreplugin/editormanager/iexternaleditor.h> #include <coreplugin/id.h> -#include <QtCore/QStringList> -#include <QtCore/QMap> +#include <QStringList> +#include <QMap> QT_BEGIN_NAMESPACE class QProcess; diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp index ba1e1d68b0..e889d4f8ee 100644 --- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp +++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp @@ -43,9 +43,9 @@ #include <projectexplorer/toolchain.h> #include <projectexplorer/buildconfiguration.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QTextStream> +#include <QFileInfo> +#include <QDir> +#include <QTextStream> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.h b/src/plugins/qt4projectmanager/librarydetailscontroller.h index e234a4eed8..ae7e4d6294 100644 --- a/src/plugins/qt4projectmanager/librarydetailscontroller.h +++ b/src/plugins/qt4projectmanager/librarydetailscontroller.h @@ -33,7 +33,7 @@ #ifndef LIBRARYDETAILSCONTROLLER_H #define LIBRARYDETAILSCONTROLLER_H -#include <QtGui/QWidget> +#include <QWidget> #include "addlibrarywizard.h" namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 4c10ab9ec8..4b5a05596c 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -47,8 +47,8 @@ #include <utils/qtcprocess.h> #include <qtsupport/qtparser.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QDir> +#include <QFileInfo> using ExtensionSystem::PluginManager; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/profilecompletionassist.cpp b/src/plugins/qt4projectmanager/profilecompletionassist.cpp index fc81a7b3ca..a6a1d8c99f 100644 --- a/src/plugins/qt4projectmanager/profilecompletionassist.cpp +++ b/src/plugins/qt4projectmanager/profilecompletionassist.cpp @@ -42,7 +42,7 @@ #include <cplusplus/Icons.h> -#include <QtGui/QTextCursor> +#include <QTextCursor> using namespace Qt4ProjectManager::Internal; using namespace TextEditor; diff --git a/src/plugins/qt4projectmanager/profilecompletionassist.h b/src/plugins/qt4projectmanager/profilecompletionassist.h index 260e1e825f..64984b1d6c 100644 --- a/src/plugins/qt4projectmanager/profilecompletionassist.h +++ b/src/plugins/qt4projectmanager/profilecompletionassist.h @@ -38,7 +38,7 @@ #include <texteditor/codeassist/completionassistprovider.h> #include <texteditor/codeassist/iassistprocessor.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp index 78846a421e..239b20dd24 100644 --- a/src/plugins/qt4projectmanager/profileeditor.cpp +++ b/src/plugins/qt4projectmanager/profileeditor.cpp @@ -46,9 +46,9 @@ #include <texteditor/texteditorconstants.h> #include <texteditor/texteditorsettings.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QMenu> +#include <QFileInfo> +#include <QDir> +#include <QMenu> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp index 8475d4bccb..0366de390f 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp +++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp @@ -41,9 +41,9 @@ #include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditorsettings.h> -#include <QtCore/QFileInfo> -#include <QtGui/QAction> -#include <QtGui/QMenu> +#include <QFileInfo> +#include <QAction> +#include <QMenu> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.h b/src/plugins/qt4projectmanager/profileeditorfactory.h index d3040b8c90..e89d759dd2 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.h +++ b/src/plugins/qt4projectmanager/profileeditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace TextEditor { class TextEditorActionHandler; diff --git a/src/plugins/qt4projectmanager/profilehighlighter.cpp b/src/plugins/qt4projectmanager/profilehighlighter.cpp index 123fc74c56..6ece4ef079 100644 --- a/src/plugins/qt4projectmanager/profilehighlighter.cpp +++ b/src/plugins/qt4projectmanager/profilehighlighter.cpp @@ -33,10 +33,10 @@ #include "profilehighlighter.h" #include "profilekeywords.h" -#include <QtCore/QRegExp> -#include <QtGui/QColor> -#include <QtGui/QTextDocument> -#include <QtGui/QTextEdit> +#include <QRegExp> +#include <QColor> +#include <QTextDocument> +#include <QTextEdit> using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/profilehighlighter.h b/src/plugins/qt4projectmanager/profilehighlighter.h index 3388b3aafd..d5f37b02e9 100644 --- a/src/plugins/qt4projectmanager/profilehighlighter.h +++ b/src/plugins/qt4projectmanager/profilehighlighter.h @@ -34,9 +34,9 @@ #define PROFILEHIGHLIGHTER_H #include <texteditor/syntaxhighlighter.h> -#include <QtCore/QtAlgorithms> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextCharFormat> +#include <QtAlgorithms> +#include <QSyntaxHighlighter> +#include <QTextCharFormat> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.cpp b/src/plugins/qt4projectmanager/profilehoverhandler.cpp index cff9c6c928..c8cf77e4e7 100644 --- a/src/plugins/qt4projectmanager/profilehoverhandler.cpp +++ b/src/plugins/qt4projectmanager/profilehoverhandler.cpp @@ -44,9 +44,9 @@ #include <texteditor/tooltip/tooltip.h> #include <utils/htmldocextractor.h> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> -#include <QtCore/QUrl> +#include <QTextCursor> +#include <QTextBlock> +#include <QUrl> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.h b/src/plugins/qt4projectmanager/profilehoverhandler.h index a02fa4e340..3c87d295bc 100644 --- a/src/plugins/qt4projectmanager/profilehoverhandler.h +++ b/src/plugins/qt4projectmanager/profilehoverhandler.h @@ -35,7 +35,7 @@ #include <texteditor/basehoverhandler.h> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QUrl; diff --git a/src/plugins/qt4projectmanager/profilekeywords.h b/src/plugins/qt4projectmanager/profilekeywords.h index 21bc9f2fdc..e8229a4d51 100644 --- a/src/plugins/qt4projectmanager/profilekeywords.h +++ b/src/plugins/qt4projectmanager/profilekeywords.h @@ -33,7 +33,7 @@ #ifndef PROFILEKEYWORDS_H #define PROFILEKEYWORDS_H -#include <QtCore/QStringList> +#include <QStringList> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qmakeparser.h b/src/plugins/qt4projectmanager/qmakeparser.h index b25c005f53..71ddcc7e97 100644 --- a/src/plugins/qt4projectmanager/qmakeparser.h +++ b/src/plugins/qt4projectmanager/qmakeparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 2bddba4b9a..0a99e24105 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -57,11 +57,11 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QDir> +#include <QFile> #include <utils/runextensions.h> -#include <QtCore/QtConcurrentRun> -#include <QtGui/QMessageBox> +#include <QtConcurrentRun> +#include <QMessageBox> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 7a04f18b04..265147b728 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -37,7 +37,7 @@ #include <utils/fileutils.h> #include <projectexplorer/abstractprocessstep.h> -#include <QtCore/QStringList> +#include <QStringList> namespace ProjectExplorer { class BuildStep; diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp index b1d4a90708..1e5c31fd81 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp @@ -36,9 +36,9 @@ #include <qtsupport/qtsupportconstants.h> #include <proparser/profileevaluator.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfoList> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfoList> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp index e096b63886..e012c7f12b 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp @@ -37,7 +37,7 @@ #include <qtsupport/qtversionmanager.h> #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp index 6a45e437cc..e79bc1c93b 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp @@ -37,8 +37,8 @@ #include "qt4buildconfiguration.h" #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/customexecutablerunconfiguration.h> -#include <QtGui/QApplication> -#include <QtGui/QStyle> +#include <QApplication> +#include <QStyle> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp index f9a68cd64a..dcc3724aa4 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp @@ -44,10 +44,10 @@ #include <qtsupport/qtversionmanager.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QApplication> -#include <QtGui/QStyle> -#include <QtGui/QLabel> +#include <QVBoxLayout> +#include <QApplication> +#include <QStyle> +#include <QLabel> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index 25f26f308b..ac1cf7f906 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp @@ -60,15 +60,15 @@ #include <qtsupport/baseqtversion.h> #include <qtsupport/profilereader.h> -#include <QtGui/QFormLayout> -#include <QtGui/QInputDialog> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QCheckBox> -#include <QtGui/QToolButton> -#include <QtGui/QComboBox> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> +#include <QFormLayout> +#include <QInputDialog> +#include <QLabel> +#include <QLineEdit> +#include <QCheckBox> +#include <QToolButton> +#include <QComboBox> +#include <QFileInfo> +#include <QDir> using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h index 00a0056330..483d6c92af 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h @@ -37,10 +37,10 @@ #include <utils/environment.h> -#include <QtCore/QStringList> -#include <QtCore/QMetaType> -#include <QtGui/QLabel> -#include <QtGui/QWidget> +#include <QStringList> +#include <QMetaType> +#include <QLabel> +#include <QWidget> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp index 0dd85c835c..dbf820d06c 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp @@ -38,7 +38,7 @@ #include <projectexplorer/customexecutablerunconfiguration.h> #include <projectexplorer/deployconfiguration.h> -#include <QtGui/QApplication> +#include <QApplication> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp index 340936d4c3..162038aafc 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp @@ -42,8 +42,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/customexecutablerunconfiguration.h> -#include <QtGui/QApplication> -#include <QtGui/QStyle> +#include <QApplication> +#include <QStyle> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp index 141a910145..5d9af88b53 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp @@ -36,9 +36,9 @@ #include <qtsupport/qtsupportconstants.h> #include <proparser/profileevaluator.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfoList> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfoList> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp index a604c87685..0400b8542f 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp @@ -37,7 +37,7 @@ #include <qtsupport/qtsupportconstants.h> #include <qtsupport/profilereader.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.h b/src/plugins/qt4projectmanager/qt-s60/abldparser.h index 8e763946d3..fccf25feeb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/abldparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp index 2e21d7ae62..da96341795 100644 --- a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp @@ -33,7 +33,7 @@ #include "certificatepathchooser.h" #include "s60certificateinfo.h" -#include <QtGui/QMessageBox> +#include <QMessageBox> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp index ff5ca3dd93..7b433b33c1 100644 --- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp @@ -49,14 +49,14 @@ #include <symbianutils/symbiandevicemanager.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> +#include <QDir> +#include <QFileInfo> +#include <QTimer> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QMessageBox> +#include <QMainWindow> -#include <QtNetwork/QTcpSocket> +#include <QTcpSocket> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp index c2922029b7..8333292302 100644 --- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp @@ -39,7 +39,7 @@ #include <projectexplorer/toolchainmanager.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QDir> +#include <QDir> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp index f645a6a833..418101789d 100644 --- a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp @@ -32,12 +32,12 @@ #include "passphraseforkeydialog.h" -#include <QtGui/QCheckBox> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QPushButton> -#include <QtGui/QVBoxLayout> +#include <QCheckBox> +#include <QDialogButtonBox> +#include <QLabel> +#include <QLineEdit> +#include <QPushButton> +#include <QVBoxLayout> using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h index 85b90bfbeb..242f240b3b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h +++ b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h @@ -33,7 +33,7 @@ #ifndef PASSPHRASEFORKEYDIALOG_H #define PASSPHRASEFORKEYDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> QT_FORWARD_DECLARE_CLASS(QCheckBox) QT_FORWARD_DECLARE_CLASS(QDialogButtonBox) diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp index 554c91958d..6c3107cdde 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp @@ -47,8 +47,8 @@ #include <projectexplorer/toolchain.h> #include <symbianutils/symbiandevicemanager.h> #include <extensionsystem/pluginmanager.h> -#include <QtGui/QPainter> -#include <QtGui/QApplication> +#include <QPainter> +#include <QApplication> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h index 0923dd3d8c..5f4ef5519f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h +++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h @@ -35,7 +35,7 @@ #include "qt4target.h" -#include <QtGui/QPixmap> +#include <QPixmap> namespace Qt4ProjectManager { class Qt4Project; diff --git a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h index 4570c5da82..c13a10f395 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp index 49a5e6a2a8..ae09bf3fff 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp @@ -42,11 +42,11 @@ #include <utils/environmentmodel.h> #include <utils/synchronousprocess.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> +#include <QDir> +#include <QFileInfo> +#include <QProcess> +#include <QGridLayout> +#include <QLabel> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h index 7cec9f00b7..235959254f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h @@ -33,7 +33,7 @@ #ifndef S60CERTIFICATEDETAILSDIALOG_H #define S60CERTIFICATEDETAILSDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> struct S60CertificateDetailsDialogPrivate; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp index e66caccb30..fcc869948e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp @@ -33,12 +33,12 @@ #include "s60certificateinfo.h" #include "s60symbiancertificate.h" -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QTextStream> -#include <QtCore/QHash> -#include <QtCore/QMutableHashIterator> +#include <QDateTime> +#include <QFileInfo> +#include <QCoreApplication> +#include <QTextStream> +#include <QHash> +#include <QMutableHashIterator> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h index ef85065b86..8c73e18d79 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h @@ -33,9 +33,9 @@ #ifndef S60CERTIFICATEINFO_H #define S60CERTIFICATEINFO_H -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QtGlobal> +#include <QObject> +#include <QStringList> +#include <QtGlobal> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h index 96fec081e3..1df807014a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp index 2652e7cf63..123fa418e6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp @@ -57,12 +57,12 @@ #include <projectexplorer/gnumakeparser.h> #include <projectexplorer/task.h> -#include <QtCore/QDir> -#include <QtCore/QTimer> -#include <QtCore/QCryptographicHash> +#include <QDir> +#include <QTimer> +#include <QCryptographicHash> -#include <QtCore/QSettings> -#include <QtGui/QMessageBox> +#include <QSettings> +#include <QMessageBox> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h index 90f2012e67..1b943d2dcc 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h @@ -38,8 +38,8 @@ #include <projectexplorer/buildstep.h> #include <qt4projectmanager/makestep.h> -#include <QtCore/QMutex> -#include <QtCore/QWaitCondition> +#include <QMutex> +#include <QWaitCondition> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp index c0fb481aa5..f5ec79b453 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp @@ -50,7 +50,7 @@ #include <projectexplorer/project.h> #include <projectexplorer/toolchain.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp index b4ddb3904c..943700a0c6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp @@ -46,25 +46,25 @@ #include <utils/qtcassert.h> #include <utils/pathchooser.h> -#include <QtCore/QDir> -#include <QtCore/QTimer> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QComboBox> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QToolButton> -#include <QtGui/QStyle> -#include <QtGui/QApplication> -#include <QtGui/QSpacerItem> -#include <QtGui/QMessageBox> -#include <QtGui/QCheckBox> -#include <QtGui/QGroupBox> -#include <QtGui/QRadioButton> -#include <QtGui/QValidator> - -#include <QtNetwork/QTcpSocket> +#include <QDir> +#include <QTimer> +#include <QLabel> +#include <QLineEdit> +#include <QComboBox> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QFormLayout> +#include <QToolButton> +#include <QStyle> +#include <QApplication> +#include <QSpacerItem> +#include <QMessageBox> +#include <QCheckBox> +#include <QGroupBox> +#include <QRadioButton> +#include <QValidator> + +#include <QTcpSocket> Q_DECLARE_METATYPE(SymbianUtils::SymbianDevice) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h index 45b452b87f..09645a8d40 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h @@ -35,8 +35,8 @@ #include <projectexplorer/deployconfiguration.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp index 949086250a..1db4799c86 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp @@ -47,17 +47,17 @@ #include <symbianutils/symbiandevicemanager.h> #include <utils/qtcassert.h> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QMessageBox> +#include <QMainWindow> -#include <QtCore/QTimer> -#include <QtCore/QDateTime> -#include <QtCore/QDir> -#include <QtCore/QEventLoop> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <QTimer> +#include <QDateTime> +#include <QDir> +#include <QEventLoop> +#include <QFile> +#include <QFileInfo> -#include <QtNetwork/QTcpSocket> +#include <QTcpSocket> using namespace ProjectExplorer; using namespace SymbianUtils; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h index ccea6a1b55..1ba08c8762 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h @@ -35,7 +35,7 @@ #include <projectexplorer/buildstep.h> -#include <QtCore/QString> +#include <QString> QT_FORWARD_DECLARE_CLASS(QEventLoop) QT_FORWARD_DECLARE_CLASS(QFile) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp index 8097234fb6..1f330d6317 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp @@ -44,7 +44,7 @@ #include <projectexplorer/buildconfiguration.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace ProjectExplorer; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index 2f0db5fad6..49a688ad7b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -36,8 +36,8 @@ #include <projectexplorer/runconfiguration.h> #include <qt4projectmanager/qt4projectmanager_global.h> -#include <QtCore/QFutureInterface> -#include <QtCore/QStringList> +#include <QFutureInterface> +#include <QStringList> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp index 57742b073c..1da3a93ee0 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp @@ -38,11 +38,11 @@ #include <coreplugin/helpmanager.h> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QFormLayout> +#include <QLabel> +#include <QLineEdit> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QFormLayout> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h index 8bec123168..2677255476 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h @@ -33,8 +33,8 @@ #ifndef S60DEVICERUNCONFIGURATIONWIDGET_H #define S60DEVICERUNCONFIGURATIONWIDGET_H -#include <QtGui/QWidget> -#include <QtGui/QLabel> +#include <QWidget> +#include <QLabel> QT_BEGIN_NAMESPACE class QLineEdit; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp index 54d151a40e..d6fd37d426 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp @@ -47,9 +47,9 @@ #include <qtsupport/qtoutputformatter.h> #include <qtsupport/baseqtversion.h> -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QFormLayout> +#include <QLabel> +#include <QVBoxLayout> +#include <QFormLayout> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h index 4bc00deda2..1ce10f83fd 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h @@ -36,8 +36,8 @@ #include <projectexplorer/runconfiguration.h> #include <projectexplorer/applicationlauncher.h> -#include <QtCore/QVariantMap> -#include <QtGui/QWidget> +#include <QVariantMap> +#include <QWidget> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp index 3afa5cb682..703ea9df2b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp @@ -58,9 +58,9 @@ #include <debugger/debuggerconstants.h> #include <utils/qtcassert.h> -#include <QtGui/QMainWindow> +#include <QMainWindow> -#include <QtCore/QDir> +#include <QDir> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.h b/src/plugins/qt4projectmanager/qt-s60/s60manager.h index 9a36f3b6dc..fc1ba2f4e2 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.h @@ -33,7 +33,7 @@ #ifndef S60MANAGER_H #define S60MANAGER_H -#include <QtCore/QObject> +#include <QObject> namespace ProjectExplorer { class ToolChain; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp index 80b1d58d70..32c0fcc57e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp @@ -50,7 +50,7 @@ #include <utils/fileutils.h> #include <proparser/prowriter.h> -#include <QtCore/QProcess> +#include <QProcess> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h index 54c693a377..be158be934 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h @@ -32,8 +32,8 @@ #ifndef S60PUBLISHEROVI_H #define S60PUBLISHEROVI_H -#include <QtCore/QObject> -#include <QtGui/QColor> +#include <QObject> +#include <QColor> QT_BEGIN_NAMESPACE class QProcess; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp index 2d88138b23..fbda8a5d12 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp @@ -40,7 +40,7 @@ #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> -#include <QtGui/QAbstractButton> +#include <QAbstractButton> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h index 62bdbb4d26..1c8be1bd10 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h @@ -33,7 +33,7 @@ #ifndef S60PUBLISHINGBUILDSETTINGSPAGEOVI_H #define S60PUBLISHINGBUILDSETTINGSPAGEOVI_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace ProjectExplorer { class Project; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp index 187d66ce35..0cb1f12e0b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp @@ -33,10 +33,10 @@ #include "s60publisherovi.h" #include "ui_s60publishingresultspageovi.h" -#include <QtGui/QDesktopServices> -#include <QtGui/QAbstractButton> -#include <QtGui/QScrollBar> -#include <QtCore/QProcess> +#include <QDesktopServices> +#include <QAbstractButton> +#include <QScrollBar> +#include <QProcess> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp index 379f8c5ef8..19431c9dbf 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp @@ -35,7 +35,7 @@ #include "s60publisherovi.h" #include "s60certificateinfo.h" -#include <QtGui/QAbstractButton> +#include <QAbstractButton> using namespace ProjectExplorer; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h index db61b0acf6..f3a446595a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h @@ -33,7 +33,7 @@ #ifndef S60PUBLISHINGSISSETTINGSPAGEOVI_H #define S60PUBLISHINGSISSETTINGSPAGEOVI_H -#include <QtGui/QWizardPage> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp index be16e88b55..30b6230b03 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp @@ -47,9 +47,9 @@ #include <coreplugin/icore.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <QtCore/QDateTime> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QDateTime> +#include <QDir> +#include <QFileInfo> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h index 616fa5f239..5b64516402 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h @@ -37,7 +37,7 @@ #include <projectexplorer/runconfiguration.h> #include <projectexplorer/toolchain.h> -#include <QtCore/QFutureInterface> +#include <QFutureInterface> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp index 0cafbd0c9f..6494d379fc 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp @@ -50,7 +50,7 @@ #include <memory> #include <string> -#include <QtCore/QDateTime> +#include <QDateTime> using namespace Botan; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h index 5134ef131d..8700ff4efc 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h @@ -33,7 +33,7 @@ #ifndef S60SYMBIANCERTIFICATE_H #define S60SYMBIANCERTIFICATE_H -#include <QtCore/QStringList> +#include <QStringList> QT_FORWARD_DECLARE_CLASS(QDateTime) diff --git a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h index d1d20445f8..623d8fa3df 100644 --- a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h +++ b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h @@ -35,8 +35,8 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QDir> -#include <QtCore/QXmlStreamReader> +#include <QDir> +#include <QXmlStreamReader> namespace ProjectExplorer { class TaskHub; diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp index 6b408c2d60..a365ef9312 100644 --- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp @@ -44,11 +44,11 @@ #include <utils/environment.h> #include <proparser/profileevaluator.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QSettings> -#include <QtGui/QLabel> -#include <QtGui/QFormLayout> +#include <QCoreApplication> +#include <QDir> +#include <QSettings> +#include <QLabel> +#include <QFormLayout> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp index 40adcc588a..f4e9db3080 100644 --- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp @@ -38,7 +38,7 @@ #include <qtsupport/profilereader.h> #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.h b/src/plugins/qt4projectmanager/qt-s60/winscwparser.h index d254d61a05..2340993b9f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp index 2bea7e92d3..533f078ca7 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp @@ -42,9 +42,9 @@ #include <utils/environment.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QStringList> +#include <QDir> +#include <QFileInfo> +#include <QStringList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt4basetargetfactory.h b/src/plugins/qt4projectmanager/qt4basetargetfactory.h index 069e4e3d54..a93b2836aa 100644 --- a/src/plugins/qt4projectmanager/qt4basetargetfactory.h +++ b/src/plugins/qt4projectmanager/qt4basetargetfactory.h @@ -38,7 +38,7 @@ #include <projectexplorer/task.h> #include <projectexplorer/target.h> -#include <QtCore/QList> +#include <QList> namespace Core { class FeatureSet; diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index f95bab2979..92a72eb474 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -50,9 +50,9 @@ #include <qtsupport/qtversionfactory.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QInputDialog> +#include <QInputDialog> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index ae95dffcce..89fa1a6311 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -63,17 +63,17 @@ #include <proparser/prowriter.h> #include <algorithm> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QXmlStreamReader> - -#include <QtGui/QPainter> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QCoreApplication> +#include <QXmlStreamReader> + +#include <QPainter> +#include <QMainWindow> +#include <QMessageBox> +#include <QPushButton> #include <utils/QtConcurrentTools> // Static cached data in struct Qt4NodeStaticData providing information and icons diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h index cb25e4e13c..bb5ade1f77 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.h +++ b/src/plugins/qt4projectmanager/qt4nodes.h @@ -39,11 +39,11 @@ #include <coreplugin/ifile.h> #include <projectexplorer/projectnodes.h> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtCore/QDateTime> -#include <QtCore/QMap> -#include <QtCore/QFutureWatcher> +#include <QHash> +#include <QStringList> +#include <QDateTime> +#include <QMap> +#include <QFutureWatcher> // defined in proitems.h QT_BEGIN_NAMESPACE diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 29d4fc2088..c1abc4b0c1 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -66,11 +66,11 @@ #include <qtsupport/qtversionmanager.h> #include <utils/QtConcurrentTools> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileSystemWatcher> -#include <QtGui/QFileDialog> -#include <QtGui/QInputDialog> +#include <QDebug> +#include <QDir> +#include <QFileSystemWatcher> +#include <QFileDialog> +#include <QInputDialog> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index 26dd0ab4a5..3b90ec039e 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -38,11 +38,11 @@ #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> -#include <QtCore/QStringList> -#include <QtCore/QMap> -#include <QtCore/QFutureInterface> -#include <QtCore/QTimer> -#include <QtCore/QFuture> +#include <QStringList> +#include <QMap> +#include <QFutureInterface> +#include <QTimer> +#include <QFuture> QT_BEGIN_NAMESPACE struct ProFileOption; diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp index 828cbcc371..614f109150 100644 --- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp @@ -58,8 +58,8 @@ #include <utils/qtcprocess.h> #include <extensionsystem/pluginmanager.h> -#include <QtGui/QFileDialog> -#include <QtGui/QPushButton> +#include <QFileDialog> +#include <QPushButton> #include <utils/detailswidget.h> namespace { diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp index 8a671b45f7..7671a3baf1 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp @@ -62,12 +62,12 @@ #include <qtsupport/baseqtversion.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QVariant> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfo> +#include <QVariant> +#include <QFileDialog> +#include <QMessageBox> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_global.h b/src/plugins/qt4projectmanager/qt4projectmanager_global.h index 8d370aa49e..9ab1733c0c 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager_global.h +++ b/src/plugins/qt4projectmanager/qt4projectmanager_global.h @@ -33,7 +33,7 @@ #ifndef QT4PROJECTMANAGER_GLOBAL_H #define QT4PROJECTMANAGER_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(QT4PROJECTMANAGER_LIBRARY) # define QT4PROJECTMANAGER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h index f34dd69022..39eb9c6d67 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h @@ -33,7 +33,7 @@ #ifndef QT4PROJECTMANAGERCONSTANTS_H #define QT4PROJECTMANAGERCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Qt4ProjectManager { namespace Constants { diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index dc5da945a9..9b705c560b 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -87,8 +87,8 @@ # include <QTest> #endif -#include <QtCore/QtPlugin> -#include <QtGui/QMenu> +#include <QtPlugin> +#include <QMenu> using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index dce6adbe01..8c58242179 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/src/plugins/qt4projectmanager/qt4target.cpp @@ -59,15 +59,15 @@ #include <utils/detailswidget.h> #include <utils/qtcprocess.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QMainWindow> -#include <QtGui/QVBoxLayout> +#include <QCoreApplication> +#include <QPushButton> +#include <QMessageBox> +#include <QCheckBox> +#include <QComboBox> +#include <QHBoxLayout> +#include <QLabel> +#include <QMainWindow> +#include <QVBoxLayout> #include <algorithm> diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h index ecfe3f69ed..898458679d 100644 --- a/src/plugins/qt4projectmanager/qt4target.h +++ b/src/plugins/qt4projectmanager/qt4target.h @@ -39,7 +39,7 @@ #include <projectexplorer/target.h> #include <projectexplorer/task.h> -#include <QtGui/QSpacerItem> +#include <QSpacerItem> namespace Utils { class DetailsWidget; diff --git a/src/plugins/qt4projectmanager/qt4targetsetupwidget.h b/src/plugins/qt4projectmanager/qt4targetsetupwidget.h index e1871176f8..a3f19c830e 100644 --- a/src/plugins/qt4projectmanager/qt4targetsetupwidget.h +++ b/src/plugins/qt4projectmanager/qt4targetsetupwidget.h @@ -35,7 +35,7 @@ #include "qt4projectmanager_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace Qt4ProjectManager { struct BuildConfigurationInfo; diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp index 78255726c4..a7e6bf3d2d 100644 --- a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp +++ b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp @@ -32,10 +32,10 @@ #include "qtmodulesinfo.h" #include "qglobal.h" -#include <QtCore/QtDebug> -#include <QtCore/QString> -#include <QtCore/QHash> -#include <QtCore/QCoreApplication> +#include <QtDebug> +#include <QString> +#include <QHash> +#include <QCoreApplication> using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.h b/src/plugins/qt4projectmanager/qtmodulesinfo.h index b9b8f3eaf7..f7521237ac 100644 --- a/src/plugins/qt4projectmanager/qtmodulesinfo.h +++ b/src/plugins/qt4projectmanager/qtmodulesinfo.h @@ -32,7 +32,7 @@ #ifndef QTMODULESINFO_H #define QTMODULESINFO_H -#include <QtCore/QStringList> +#include <QStringList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp index b47bb1fee2..9cb6f5f541 100644 --- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp +++ b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp @@ -45,9 +45,9 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QPushButton> +#include <QLabel> +#include <QVBoxLayout> +#include <QPushButton> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h index cef4cbdd3e..dc51400ee1 100644 --- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h +++ b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h @@ -35,7 +35,7 @@ #include <projectexplorer/iprojectproperties.h> -#include <QtCore/QString> +#include <QString> namespace Qt4ProjectManager { class TargetSetupPage; diff --git a/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp b/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp index 44d6bb5f52..68d1d69fa6 100644 --- a/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp +++ b/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp @@ -40,11 +40,11 @@ #include <qtsupport/qtversionmanager.h> #include <qt4projectmanager/qt4projectmanager.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> -#include <QtGui/QCheckBox> +#include <QCoreApplication> +#include <QIcon> +#include <QComboBox> +#include <QLabel> +#include <QCheckBox> #include <QFormLayout> using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.h b/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.h index 81e72c245d..d8db4e118a 100644 --- a/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.h +++ b/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.h @@ -34,7 +34,7 @@ #define UNCONFIGUREDSETTINGSOPTIONPAGE_H #include <coreplugin/dialogs/ioptionspage.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/qt4projectmanager/winceqtversion.cpp b/src/plugins/qt4projectmanager/winceqtversion.cpp index f7cb2dd1d7..372e20dd19 100644 --- a/src/plugins/qt4projectmanager/winceqtversion.cpp +++ b/src/plugins/qt4projectmanager/winceqtversion.cpp @@ -33,7 +33,7 @@ #include "winceqtversion.h" #include "qt4projectmanagerconstants.h" #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/winceqtversionfactory.cpp b/src/plugins/qt4projectmanager/winceqtversionfactory.cpp index f5bbda0789..b2521bbb26 100644 --- a/src/plugins/qt4projectmanager/winceqtversionfactory.cpp +++ b/src/plugins/qt4projectmanager/winceqtversionfactory.cpp @@ -34,7 +34,7 @@ #include "winceqtversion.h" #include <qtsupport/qtsupportconstants.h> #include <qtsupport/profilereader.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index bb0cf74f54..793af7f9fe 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -32,10 +32,10 @@ #include "abstractmobileapp.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QTextStream> +#include <QCoreApplication> +#include <QDir> +#include <QFile> +#include <QTextStream> #ifndef CREATORLESSTEST #include <coreplugin/icore.h> diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h index 587ab95d58..903fd2c174 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h @@ -34,8 +34,8 @@ #define ABSTRACTMOBILEAPP_H #include "../qt4projectmanager_global.h" -#include <QtCore/QFileInfo> -#include <QtCore/QPair> +#include <QFileInfo> +#include <QPair> #ifndef CREATORLESSTEST #include <coreplugin/basefilewizard.h> diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp index 705672a137..1e3594d90f 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp @@ -45,7 +45,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <utils/qtcassert.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp index 1aa6594760..c02dba5b13 100644 --- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp @@ -39,12 +39,12 @@ #include <cpptools/abstracteditorsupport.h> #include <qtsupport/qtsupportconstants.h> -#include <QtGui/QIcon> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> +#include <QIcon> +#include <QFileInfo> +#include <QTextStream> static const char mainCppC[] = -"#include <QtCore/QCoreApplication>\n\n" +"#include <QCoreApplication>\n\n" "int main(int argc, char *argv[])\n" "{\n" " QCoreApplication a(argc, argv);\n\n" diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp index 9fd53fd073..10b3453729 100644 --- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp @@ -34,7 +34,7 @@ #include "consoleappwizard.h" #include <coreplugin/basefilewizard.h> -#include <QtCore/QDebug> +#include <QDebug> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp index 8e6a175df4..13bc58ac63 100644 --- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp @@ -36,7 +36,7 @@ #include <projectexplorer/projectexplorerconstants.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/filespage.cpp b/src/plugins/qt4projectmanager/wizards/filespage.cpp index 38f95e05b7..d2e60bdc3f 100644 --- a/src/plugins/qt4projectmanager/wizards/filespage.cpp +++ b/src/plugins/qt4projectmanager/wizards/filespage.cpp @@ -34,8 +34,8 @@ #include <utils/newclasswidget.h> -#include <QtGui/QLabel> -#include <QtGui/QLayout> +#include <QLabel> +#include <QLayout> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/filespage.h b/src/plugins/qt4projectmanager/wizards/filespage.h index 999e3d25e2..ab2eb93e8b 100644 --- a/src/plugins/qt4projectmanager/wizards/filespage.h +++ b/src/plugins/qt4projectmanager/wizards/filespage.h @@ -33,7 +33,7 @@ #ifndef FILESPAGE_H #define FILESPAGE_H -#include <QtGui/QWizard> +#include <QWizard> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp index 103c91e11e..b508397f5a 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp @@ -44,14 +44,14 @@ #include <utils/fileutils.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QTextStream> -#include <QtCore/QUuid> -#include <QtCore/QFileInfo> -#include <QtCore/QSharedPointer> +#include <QDir> +#include <QFile> +#include <QTextStream> +#include <QUuid> +#include <QFileInfo> +#include <QSharedPointer> -#include <QtGui/QIcon> +#include <QIcon> static const char mainSourceFileC[] = "main"; static const char mainSourceShowC[] = " w.show();\n"; diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp index 740d4f2219..6a72bfe67c 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp @@ -37,7 +37,7 @@ #include "qtprojectparameters.h" #include "qt4projectmanagerconstants.h" -#include <QtCore/QSet> +#include <QSet> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/html5app.cpp b/src/plugins/qt4projectmanager/wizards/html5app.cpp index 643a33aa29..95e798bbb5 100644 --- a/src/plugins/qt4projectmanager/wizards/html5app.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5app.cpp @@ -32,11 +32,11 @@ #include "html5app.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QFile> +#include <QRegExp> +#include <QTextStream> +#include <QCoreApplication> #ifndef CREATORLESSTEST #include <coreplugin/icore.h> diff --git a/src/plugins/qt4projectmanager/wizards/html5app.h b/src/plugins/qt4projectmanager/wizards/html5app.h index ae758efb1a..0c45d691d1 100644 --- a/src/plugins/qt4projectmanager/wizards/html5app.h +++ b/src/plugins/qt4projectmanager/wizards/html5app.h @@ -35,8 +35,8 @@ #include "abstractmobileapp.h" -#include <QtCore/QHash> -#include <QtCore/QStringList> +#include <QHash> +#include <QStringList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp index 096ac39367..4b7d185024 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp @@ -42,8 +42,8 @@ #include <qtsupport/qtsupportconstants.h> #include <limits> -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp index c864be9272..411d84976d 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp @@ -34,10 +34,10 @@ #include "ui_html5appwizardsourcespage.h" #include <coreplugin/coreconstants.h> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDesktopServices> +#include <QFileDialog> +#include <QFileDialog> +#include <QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h index fb2b36632c..26cf4cfb4a 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h @@ -33,7 +33,7 @@ #ifndef HTML5APPWIZARDPAGES_H #define HTML5APPWIZARDPAGES_H -#include <QtGui/QWizardPage> +#include <QWizardPage> #include "html5app.h" namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp index aae672c9da..8e15586abc 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp @@ -34,8 +34,8 @@ #include <utils/codegeneration.h> -#include <QtCore/QTextStream> -#include <QtCore/QStringList> +#include <QTextStream> +#include <QStringList> // Contents of the header defining the shared library export. #define GUARD_VARIABLE "<GUARD>" diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.h b/src/plugins/qt4projectmanager/wizards/libraryparameters.h index 9188d20a91..cee975f7fc 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.h +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.h @@ -35,7 +35,7 @@ #include "qtprojectparameters.h" -#include <QtCore/QString> +#include <QString> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp index e879d74c4c..27d98cb6b4 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp @@ -40,10 +40,10 @@ #include <cpptools/abstracteditorsupport.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtGui/QIcon> +#include <QDir> +#include <QFileInfo> +#include <QTextStream> +#include <QIcon> static const char sharedHeaderPostfixC[] = "_global"; diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp index 755f42eb1e..9dc08805f2 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp @@ -41,11 +41,11 @@ #include <utils/projectintropage.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> +#include <QDebug> +#include <QDir> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> +#include <QComboBox> +#include <QLabel> enum { debugLibWizard = 0 }; diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp index 6e191ac1db..73c7c94de9 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp @@ -34,10 +34,10 @@ #include <coreplugin/icore.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> +#include <QDir> +#include <QFile> +#include <QRegExp> +#include <QTextStream> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp index f70fdaa812..a79a53e39a 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp @@ -42,8 +42,8 @@ #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp index 06c9c63da3..247fbc220e 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp @@ -38,11 +38,11 @@ #include <coreplugin/coreconstants.h> #include <utils/fileutils.h> -#include <QtCore/QTemporaryFile> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QTemporaryFile> +#include <QDesktopServices> +#include <QFileDialog> +#include <QFileDialog> +#include <QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h index b64b6aa498..433099ab74 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h @@ -35,7 +35,7 @@ #include "abstractmobileapp.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp index 0cb8c843a9..2574a27cb9 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp @@ -33,8 +33,8 @@ #include "mobilelibraryparameters.h" #include "qtprojectparameters.h" -#include <QtCore/QTextStream> -#include <QtCore/QDir> +#include <QTextStream> +#include <QDir> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h index 9195623926..d2fb832a9a 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h +++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h @@ -33,7 +33,7 @@ #ifndef MOBILELIBRARYPARAMETERS_H #define MOBILELIBRARYPARAMETERS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp index 7fa6d782e0..15f40f2241 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp @@ -36,9 +36,9 @@ #include <coreplugin/coreconstants.h> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDesktopServices> +#include <QFileDialog> +#include <QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h index 2739f7ca77..456ce2292c 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h +++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h @@ -33,7 +33,7 @@ #ifndef MOBILELIBRARYWIZARDOPTIONPAGE_H #define MOBILELIBRARYWIZARDOPTIONPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp index ffb8a7d3c5..6539cbf04a 100644 --- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp +++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp @@ -36,13 +36,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QVariant> +#include <QDebug> +#include <QVariant> -#include <QtGui/QCheckBox> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QWidget> +#include <QCheckBox> +#include <QLabel> +#include <QLayout> +#include <QWidget> #include <math.h> diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.h b/src/plugins/qt4projectmanager/wizards/modulespage.h index 3654ae6382..4b31480183 100644 --- a/src/plugins/qt4projectmanager/wizards/modulespage.h +++ b/src/plugins/qt4projectmanager/wizards/modulespage.h @@ -33,9 +33,9 @@ #ifndef MODULESPAGE_H #define MODULESPAGE_H -#include <QtCore/QMap> -#include <QtCore/QStringList> -#include <QtGui/QWizard> +#include <QMap> +#include <QStringList> +#include <QWizard> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp index d96b870840..4caa1d029e 100644 --- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp @@ -33,11 +33,11 @@ #include "qtprojectparameters.h" #include <utils/codegeneration.h> -#include <QtCore/QTextStream> -#include <QtCore/QDir> -#include <QtCore/QCoreApplication> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> +#include <QTextStream> +#include <QDir> +#include <QCoreApplication> +#include <QDateTime> +#include <QDebug> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h index 146a53de09..2eccb33516 100644 --- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h +++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h @@ -33,7 +33,7 @@ #ifndef QTPROJECTPARAMETERS_H #define QTPROJECTPARAMETERS_H -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index 4d1e3d3313..8f022de526 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -32,11 +32,11 @@ #include "qtquickapp.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QFile> +#include <QRegExp> +#include <QTextStream> +#include <QCoreApplication> #ifndef CREATORLESSTEST #include <coreplugin/icore.h> diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.h b/src/plugins/qt4projectmanager/wizards/qtquickapp.h index 82e5d93f5d..ed124cf2a4 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.h +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.h @@ -35,8 +35,8 @@ #include "abstractmobileapp.h" -#include <QtCore/QHash> -#include <QtCore/QStringList> +#include <QHash> +#include <QStringList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp index 7f3959d2e2..48fca50381 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp @@ -42,9 +42,9 @@ #include <projectexplorer/projectexplorerconstants.h> #include <coreplugin/dialogs/iwizard.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QIcon> +#include <QDebug> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp index ee2de0f1bc..15f3333be6 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp @@ -34,10 +34,10 @@ #include "ui_qtquickcomponentsetoptionspage.h" #include <coreplugin/coreconstants.h> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDesktopServices> +#include <QFileDialog> +#include <QFileDialog> +#include <QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h index d1c2cead9c..fda053b2ff 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h @@ -35,7 +35,7 @@ #include "qtquickapp.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp index 08536dbdd3..bfe642b2f6 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp @@ -49,8 +49,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QVariant> +#include <QCoreApplication> +#include <QVariant> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h index a823e870e1..ababad4175 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.h +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h @@ -39,7 +39,7 @@ #include <coreplugin/basefilewizard.h> -#include <QtCore/QSet> +#include <QSet> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp index 2b4e9a86e9..0c58f4a45b 100644 --- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp @@ -37,7 +37,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <coreplugin/icore.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp index 85f33f14aa..76858f05d3 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp @@ -49,8 +49,8 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> -#include <QtGui/QLabel> -#include <QtGui/QLayout> +#include <QLabel> +#include <QLayout> using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h b/src/plugins/qt4projectmanager/wizards/targetsetuppage.h index 396b70dbe5..0c32e5ebad 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.h @@ -38,8 +38,8 @@ #include <qtsupport/qtversionmanager.h> #include <coreplugin/featureprovider.h> -#include <QtCore/QString> -#include <QtGui/QWizard> +#include <QString> +#include <QWizard> QT_BEGIN_NAMESPACE diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp index 012fcb9ff3..decd84fd45 100644 --- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp @@ -39,10 +39,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> +#include <QTextStream> +#include <QFileInfo> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { @@ -98,9 +98,9 @@ static QString generateTestCode(const TestWizardParameters &testParams, QTextStream str(&rc); // Includes str << CppTools::AbstractEditorSupport::licenseTemplate(testParams.fileName, testParams.className) - << "#include <QtCore/QString>\n#include <QtTest/QtTest>\n"; + << "#include <QString>\n#include <QtTest>\n"; if (testParams.requiresQApplication) - str << "#include <QtCore/QCoreApplication>\n"; + str << "#include <QCoreApplication>\n"; // Class declaration str << "\nclass " << testParams.className << " : public QObject\n" "{\n" << indent << "Q_OBJECT\n\npublic:\n" diff --git a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp index ca8b2f1712..6b5561a3e8 100644 --- a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp @@ -33,7 +33,7 @@ #include "testwizarddialog.h" #include "testwizardpage.h" -#include <QtCore/QFileInfo> +#include <QFileInfo> enum PageIds { StartPageId = 0 }; diff --git a/src/plugins/qt4projectmanager/wizards/testwizardpage.h b/src/plugins/qt4projectmanager/wizards/testwizardpage.h index c51f8b3c2d..9cf9b775e4 100644 --- a/src/plugins/qt4projectmanager/wizards/testwizardpage.h +++ b/src/plugins/qt4projectmanager/wizards/testwizardpage.h @@ -33,7 +33,7 @@ #ifndef TESTWIZARDPAGE_H #define TESTWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index fb2f013489..327d545852 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -50,10 +50,10 @@ #include <utils/environment.h> #include <utils/synchronousprocess.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QProcess> +#include <QDir> +#include <QFileInfo> +#include <QCoreApplication> +#include <QProcess> using namespace QtSupport; using namespace QtSupport::Internal; diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index e27f2a597f..8d09721fc9 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -42,8 +42,8 @@ #include <projectexplorer/task.h> #include <coreplugin/featureprovider.h> -#include <QtCore/QVariantMap> -#include <QtGui/QWidget> +#include <QVariantMap> +#include <QWidget> namespace Utils { class Environment; diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.cpp b/src/plugins/qtsupport/debugginghelperbuildtask.cpp index 73a29b229b..1752d9edf6 100644 --- a/src/plugins/qtsupport/debugginghelperbuildtask.cpp +++ b/src/plugins/qtsupport/debugginghelperbuildtask.cpp @@ -44,7 +44,7 @@ #include <projectexplorer/abi.h> #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace QtSupport; using namespace QtSupport::Internal; diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.h b/src/plugins/qtsupport/debugginghelperbuildtask.h index f6ea985509..df0af2d697 100644 --- a/src/plugins/qtsupport/debugginghelperbuildtask.h +++ b/src/plugins/qtsupport/debugginghelperbuildtask.h @@ -38,9 +38,9 @@ #include <utils/fileutils.h> #include <projectexplorer/toolchain.h> -#include <QtCore/QObject> -#include <QtCore/QFutureInterface> -#include <QtCore/QMetaType> +#include <QObject> +#include <QFutureInterface> +#include <QMetaType> namespace QtSupport { diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 669429d031..27b6339458 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -32,9 +32,9 @@ #include "exampleslistmodel.h" -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QXmlStreamReader> +#include <QFile> +#include <QDir> +#include <QXmlStreamReader> #include <QDebug> diff --git a/src/plugins/qtsupport/exampleslistmodel.h b/src/plugins/qtsupport/exampleslistmodel.h index ac7989aaf8..75f98e1c1e 100644 --- a/src/plugins/qtsupport/exampleslistmodel.h +++ b/src/plugins/qtsupport/exampleslistmodel.h @@ -35,8 +35,8 @@ #include <QAbstractListModel> #include <QStringList> -#include <QtCore/QXmlStreamReader> -#include <QtGui/QSortFilterProxyModel> +#include <QXmlStreamReader> +#include <QSortFilterProxyModel> namespace QtSupport { namespace Internal { diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 2741e32071..5b112daa2c 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -43,32 +43,30 @@ #include <coreplugin/helpmanager.h> #include <projectexplorer/projectexplorer.h> -#include <QtCore/QMutex> -#include <QtCore/QThread> -#include <QtCore/QMutexLocker> -#include <QtCore/QWeakPointer> -#include <QtCore/QWaitCondition> -#include <QtCore/QDir> -#include <QtCore/QBuffer> -#include <QtGui/QGraphicsProxyWidget> -#include <QtGui/QScrollBar> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QImage> -#include <QtGui/QImageReader> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtSql/QSqlQueryModel> -#include <QtSql/QSqlQuery> -#include <QtDeclarative/QDeclarativeImageProvider> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeContext> +#include <QMutex> +#include <QThread> +#include <QMutexLocker> +#include <QWeakPointer> +#include <QWaitCondition> +#include <QDir> +#include <QBuffer> +#include <QGraphicsProxyWidget> +#include <QScrollBar> +#include <QSortFilterProxyModel> +#include <QImage> +#include <QImageReader> +#include <QGridLayout> +#include <QLabel> +#include <QDialogButtonBox> +#include <QPushButton> +#include <QMessageBox> +#include <QApplication> +#include <QMainWindow> +#include <QDeclarativeImageProvider> +#include <QDeclarativeEngine> +#include <QDeclarativeContext> #include <QtDeclarative> -#include <QtGui/QDesktopServices> +#include <QDesktopServices> namespace QtSupport { namespace Internal { diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.h b/src/plugins/qtsupport/gettingstartedwelcomepage.h index d2f3566162..aefa4fdeee 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.h +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.h @@ -35,7 +35,7 @@ #include <utils/iwelcomepage.h> -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QDeclarativeEngine; diff --git a/src/plugins/qtsupport/profilereader.cpp b/src/plugins/qtsupport/profilereader.cpp index 9e00baf892..551c2b1d19 100644 --- a/src/plugins/qtsupport/profilereader.cpp +++ b/src/plugins/qtsupport/profilereader.cpp @@ -35,8 +35,8 @@ #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QDir> +#include <QDebug> using namespace QtSupport; diff --git a/src/plugins/qtsupport/profilereader.h b/src/plugins/qtsupport/profilereader.h index 9178582be5..0b2bb38d1d 100644 --- a/src/plugins/qtsupport/profilereader.h +++ b/src/plugins/qtsupport/profilereader.h @@ -37,9 +37,9 @@ #include "proparser/profileparser.h" #include "proparser/profileevaluator.h" -#include <QtCore/QObject> -#include <QtCore/QMap> -#include <QtCore/QTimer> +#include <QObject> +#include <QMap> +#include <QTimer> namespace QtSupport { namespace Internal { diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp index 41b1c4e8fe..5443034099 100644 --- a/src/plugins/qtsupport/qmldumptool.cpp +++ b/src/plugins/qtsupport/qmldumptool.cpp @@ -45,11 +45,11 @@ #include <utils/runextensions.h> #include <qmljs/qmljsmodelmanagerinterface.h> #include <utils/qtcassert.h> -#include <QtGui/QDesktopServices> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QHash> +#include <QDesktopServices> +#include <QCoreApplication> +#include <QDir> +#include <QDebug> +#include <QHash> namespace { diff --git a/src/plugins/qtsupport/qmlobservertool.cpp b/src/plugins/qtsupport/qmlobservertool.cpp index 6dacb5b7ef..2f11236acf 100644 --- a/src/plugins/qtsupport/qmlobservertool.cpp +++ b/src/plugins/qtsupport/qmlobservertool.cpp @@ -38,10 +38,10 @@ #include <utils/qtcassert.h> #include <projectexplorer/project.h> -#include <QtGui/QDesktopServices> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QDesktopServices> +#include <QCoreApplication> +#include <QDir> +#include <QDebug> namespace QtSupport { diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 620b484484..a86bd49b25 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -53,11 +53,11 @@ #include <projectexplorer/projectexplorerconstants.h> #include <utils/runextensions.h> -#include <QtCore/QDir> -#include <QtGui/QToolTip> -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> +#include <QDir> +#include <QToolTip> +#include <QMessageBox> +#include <QFileDialog> +#include <QMainWindow> enum ModelRoles { VersionIdRole = Qt::UserRole, ToolChainIdRole, BuildLogRole, BuildRunningRole}; diff --git a/src/plugins/qtsupport/qtoptionspage.h b/src/plugins/qtsupport/qtoptionspage.h index 4b7ea988d1..f09ca28c39 100644 --- a/src/plugins/qtsupport/qtoptionspage.h +++ b/src/plugins/qtsupport/qtoptionspage.h @@ -36,8 +36,8 @@ #include "debugginghelperbuildtask.h" #include <coreplugin/dialogs/ioptionspage.h> -#include <QtGui/QWidget> -#include <QtGui/QIcon> +#include <QWidget> +#include <QIcon> QT_BEGIN_NAMESPACE class QTreeWidgetItem; diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp index 6cf5b1074c..6c8e167c83 100644 --- a/src/plugins/qtsupport/qtoutputformatter.cpp +++ b/src/plugins/qtsupport/qtoutputformatter.cpp @@ -36,10 +36,10 @@ #include <qt4projectmanager/qt4project.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QUrl> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QTextCursor> +#include <QFileInfo> +#include <QUrl> +#include <QPlainTextEdit> +#include <QTextCursor> using namespace ProjectExplorer; using namespace QtSupport; diff --git a/src/plugins/qtsupport/qtoutputformatter.h b/src/plugins/qtsupport/qtoutputformatter.h index 5da477d34e..762f099bf6 100644 --- a/src/plugins/qtsupport/qtoutputformatter.h +++ b/src/plugins/qtsupport/qtoutputformatter.h @@ -38,8 +38,8 @@ #include <utils/outputformatter.h> #include <utils/fileinprojectfinder.h> -#include <QtCore/QRegExp> -#include <QtCore/QWeakPointer> +#include <QRegExp> +#include <QWeakPointer> QT_FORWARD_DECLARE_CLASS(QTextCursor) diff --git a/src/plugins/qtsupport/qtsupport_global.h b/src/plugins/qtsupport/qtsupport_global.h index 5797247790..a1fc3a0041 100644 --- a/src/plugins/qtsupport/qtsupport_global.h +++ b/src/plugins/qtsupport/qtsupport_global.h @@ -33,7 +33,7 @@ #ifndef QTSUPPORT_GLOBAL_H #define QTSUPPORT_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(QTSUPPORT_LIBRARY) # define QTSUPPORT_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 21426016de..1ba5aa29ed 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -41,8 +41,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QtPlugin> -#include <QtGui/QMenu> +#include <QtPlugin> +#include <QMenu> using namespace QtSupport; using namespace QtSupport::Internal; diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp index 24be8d9a8f..d1d641c86b 100644 --- a/src/plugins/qtsupport/qtversionfactory.cpp +++ b/src/plugins/qtsupport/qtversionfactory.cpp @@ -36,7 +36,7 @@ #include "baseqtversion.h" #include <extensionsystem/pluginmanager.h> -#include <QtCore/QSettings> +#include <QSettings> using namespace QtSupport; using namespace QtSupport::Internal; diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h index cca17b28d2..2900ba6a12 100644 --- a/src/plugins/qtsupport/qtversionfactory.h +++ b/src/plugins/qtsupport/qtversionfactory.h @@ -36,8 +36,8 @@ #include "qtsupport_global.h" #include <utils/fileutils.h> -#include <QtCore/QObject> -#include <QtCore/QVariantMap> +#include <QObject> +#include <QVariantMap> QT_FORWARD_DECLARE_CLASS(QSettings) QT_FORWARD_DECLARE_CLASS(ProFileEvaluator) diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index dd1c75d531..aa83869a28 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -55,12 +55,12 @@ # include <utils/winutils.h> #endif -#include <QtCore/QFile> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtCore/QDir> -#include <QtCore/QTimer> -#include <QtGui/QMainWindow> +#include <QFile> +#include <QSettings> +#include <QTextStream> +#include <QDir> +#include <QTimer> +#include <QMainWindow> #include <algorithm> diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h index 19cc85c9ad..cccb8f3be6 100644 --- a/src/plugins/qtsupport/qtversionmanager.h +++ b/src/plugins/qtsupport/qtversionmanager.h @@ -36,8 +36,8 @@ #include "qtsupport_global.h" #include "baseqtversion.h" -#include <QtCore/QSet> -#include <QtCore/QStringList> +#include <QSet> +#include <QStringList> namespace QtSupport { namespace Internal { diff --git a/src/plugins/qtsupport/screenshotcropper.cpp b/src/plugins/qtsupport/screenshotcropper.cpp index bec9bedf43..4c2091df2f 100644 --- a/src/plugins/qtsupport/screenshotcropper.cpp +++ b/src/plugins/qtsupport/screenshotcropper.cpp @@ -1,12 +1,12 @@ #include "screenshotcropper.h" #include <coreplugin/icore.h> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtGui/QPainter> +#include <QXmlStreamReader> +#include <QXmlStreamWriter> +#include <QDebug> +#include <QFile> +#include <QFileInfo> +#include <QPainter> namespace QtSupport { namespace Internal { diff --git a/src/plugins/qtsupport/screenshotcropper.h b/src/plugins/qtsupport/screenshotcropper.h index 71c1fd499e..2a1126f027 100644 --- a/src/plugins/qtsupport/screenshotcropper.h +++ b/src/plugins/qtsupport/screenshotcropper.h @@ -1,9 +1,9 @@ #ifndef SCREENSHOTCROPPER_H #define SCREENSHOTCROPPER_H -#include <QtCore/QMap> -#include <QtCore/QRect> -#include <QtGui/QImage> +#include <QMap> +#include <QRect> +#include <QImage> namespace QtSupport { namespace Internal { diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp index b860ac5433..b71c675578 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.cpp +++ b/src/plugins/remotelinux/abstractpackagingstep.cpp @@ -40,8 +40,8 @@ #include <projectexplorer/task.h> #include <utils/fileutils.h> -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> +#include <QDateTime> +#include <QFileInfo> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp index 3c3b9cd914..80be33ea36 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp @@ -39,10 +39,10 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshconnectionmanager.h> -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> -#include <QtCore/QPointer> -#include <QtCore/QString> +#include <QDateTime> +#include <QFileInfo> +#include <QPointer> +#include <QString> using namespace Qt4ProjectManager; using namespace Utils; diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h index 2413fca1c1..e0f4fb5d3f 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h @@ -34,9 +34,9 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QVariantMap> +#include <QObject> +#include <QSharedPointer> +#include <QVariantMap> QT_FORWARD_DECLARE_CLASS(QString) namespace Utils { class SshConnection; } diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index d96108a12d..0c68d56546 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -36,7 +36,7 @@ #include <projectexplorer/buildstep.h> -#include <QtCore/QVariantMap> +#include <QVariantMap> namespace RemoteLinux { class AbstractRemoteLinuxDeployService; diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp index 8ffa4def9a..cc70ffb79b 100644 --- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp +++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp @@ -39,8 +39,8 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QFileInfo> -#include <QtCore/QString> +#include <QFileInfo> +#include <QString> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/deployablefile.h b/src/plugins/remotelinux/deployablefile.h index 7e89cf4ce9..61dc6287b7 100644 --- a/src/plugins/remotelinux/deployablefile.h +++ b/src/plugins/remotelinux/deployablefile.h @@ -35,9 +35,9 @@ #include "remotelinux_export.h" -#include <QtCore/QFileInfo> -#include <QtCore/QHash> -#include <QtCore/QString> +#include <QFileInfo> +#include <QHash> +#include <QString> namespace RemoteLinux { diff --git a/src/plugins/remotelinux/deployablefilesperprofile.cpp b/src/plugins/remotelinux/deployablefilesperprofile.cpp index 712ecae72a..8cfb982aa5 100644 --- a/src/plugins/remotelinux/deployablefilesperprofile.cpp +++ b/src/plugins/remotelinux/deployablefilesperprofile.cpp @@ -35,9 +35,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QBrush> +#include <QFileInfo> +#include <QDir> +#include <QBrush> using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/deployablefilesperprofile.h b/src/plugins/remotelinux/deployablefilesperprofile.h index a962baebfc..5fd9695995 100644 --- a/src/plugins/remotelinux/deployablefilesperprofile.h +++ b/src/plugins/remotelinux/deployablefilesperprofile.h @@ -37,9 +37,9 @@ #include <qt4projectmanager/qt4nodes.h> -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QAbstractTableModel> +#include <QList> +#include <QString> namespace RemoteLinux { class DeployableFile; diff --git a/src/plugins/remotelinux/deploymentinfo.cpp b/src/plugins/remotelinux/deploymentinfo.cpp index f5cfea8d29..42c31dff6d 100644 --- a/src/plugins/remotelinux/deploymentinfo.cpp +++ b/src/plugins/remotelinux/deploymentinfo.cpp @@ -39,8 +39,8 @@ #include <qt4projectmanager/qt4buildconfiguration.h> #include <qt4projectmanager/qt4project.h> -#include <QtCore/QList> -#include <QtCore/QTimer> +#include <QList> +#include <QTimer> using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/deploymentinfo.h b/src/plugins/remotelinux/deploymentinfo.h index 2b02cc2136..5690b3f7c2 100644 --- a/src/plugins/remotelinux/deploymentinfo.h +++ b/src/plugins/remotelinux/deploymentinfo.h @@ -34,7 +34,7 @@ #include "remotelinux_export.h" -#include <QtCore/QAbstractListModel> +#include <QAbstractListModel> namespace Qt4ProjectManager { class Qt4ProFileNode; } diff --git a/src/plugins/remotelinux/deploymentsettingsassistant.cpp b/src/plugins/remotelinux/deploymentsettingsassistant.cpp index 05d77dd53d..330e9e3e70 100644 --- a/src/plugins/remotelinux/deploymentsettingsassistant.cpp +++ b/src/plugins/remotelinux/deploymentsettingsassistant.cpp @@ -41,10 +41,10 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QHash> -#include <QtCore/QString> -#include <QtGui/QMainWindow> +#include <QDir> +#include <QHash> +#include <QString> +#include <QMainWindow> using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/deploymentsettingsassistant.h b/src/plugins/remotelinux/deploymentsettingsassistant.h index 7dae9683dd..d2912845bb 100644 --- a/src/plugins/remotelinux/deploymentsettingsassistant.h +++ b/src/plugins/remotelinux/deploymentsettingsassistant.h @@ -33,8 +33,8 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> namespace RemoteLinux { class DeployableFile; diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp index e6e61907a8..024938c441 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp @@ -36,7 +36,7 @@ #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp index ca1706db69..7ae2b9399e 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp @@ -35,7 +35,7 @@ #include "embeddedlinuxqtversion.h" #include "remotelinux_constants.h" -#include <QtCore/QFileInfo> +#include <QFileInfo> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp b/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp index b5a1b328b0..4d7488689c 100644 --- a/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp @@ -45,7 +45,7 @@ #include <qtsupport/qtversionmanager.h> -#include <QtGui/QIcon> +#include <QIcon> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index eb6579cb15..acd43b91d9 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -38,10 +38,10 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocess.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QDir> +#include <QFileInfo> +#include <QList> +#include <QString> using namespace Utils; diff --git a/src/plugins/remotelinux/genericdirectuploadservice.h b/src/plugins/remotelinux/genericdirectuploadservice.h index 33cb51cb69..320afb6a45 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.h +++ b/src/plugins/remotelinux/genericdirectuploadservice.h @@ -37,7 +37,7 @@ #include <utils/ssh/sftpdefs.h> -#include <QtCore/QList> +#include <QList> QT_FORWARD_DECLARE_CLASS(QString) diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index 2bed32616e..fe15607c92 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -36,10 +36,10 @@ #include "genericdirectuploadservice.h" #include "remotelinuxdeployconfiguration.h" -#include <QtGui/QCheckBox> -#include <QtGui/QVBoxLayout> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QCheckBox> +#include <QVBoxLayout> +#include <QList> +#include <QSharedPointer> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp b/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp index 7597f6d2ef..a20ed770fc 100644 --- a/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp +++ b/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp @@ -41,7 +41,7 @@ #include <qt4projectmanager/qt4project.h> #include <qtsupport/baseqtversion.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h index 9372985ee7..e5b22c5feb 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h @@ -35,7 +35,7 @@ #include <utils/ssh/sshconnection.h> -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp index 6b8918a268..1fcd6b1e3a 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp @@ -36,8 +36,8 @@ #include <utils/ssh/sshconnection.h> -#include <QtCore/QSettings> -#include <QtGui/QDesktopServices> +#include <QSettings> +#include <QDesktopServices> using namespace Utils; typedef SshConnectionParameters::AuthenticationType AuthType; diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.h b/src/plugins/remotelinux/linuxdeviceconfiguration.h index 14943b9a4d..c98ce2eb51 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.h +++ b/src/plugins/remotelinux/linuxdeviceconfiguration.h @@ -34,11 +34,11 @@ #include "remotelinux_export.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariantHash> -#include <QtGui/QWizard> +#include <QSharedPointer> +#include <QString> +#include <QStringList> +#include <QVariantHash> +#include <QWizard> QT_BEGIN_NAMESPACE class QDialog; diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp index cd0e5d373d..47842bf568 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp @@ -36,10 +36,10 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QSettings> -#include <QtCore/QString> +#include <QHash> +#include <QList> +#include <QSettings> +#include <QString> #include <algorithm> diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.h b/src/plugins/remotelinux/linuxdeviceconfigurations.h index fac3034887..3a48697bc2 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurations.h +++ b/src/plugins/remotelinux/linuxdeviceconfigurations.h @@ -35,7 +35,7 @@ #include "linuxdeviceconfiguration.h" #include "remotelinux_export.h" -#include <QtCore/QAbstractListModel> +#include <QAbstractListModel> QT_FORWARD_DECLARE_CLASS(QString) diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp index 33e124d2b0..c510e5413d 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp @@ -42,15 +42,15 @@ #include <extensionsystem/pluginmanager.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QFileInfo> -#include <QtCore/QRegExp> -#include <QtCore/QSettings> -#include <QtCore/QSignalMapper> -#include <QtCore/QTextStream> - -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QIntValidator> +#include <QFileInfo> +#include <QRegExp> +#include <QSettings> +#include <QSignalMapper> +#include <QTextStream> + +#include <QFileDialog> +#include <QMessageBox> +#include <QIntValidator> #include <algorithm> diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h index a284787d76..fd441fb19a 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h @@ -32,11 +32,11 @@ #ifndef LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H #define LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H -#include <QtCore/QList> -#include <QtCore/QScopedPointer> -#include <QtCore/QString> -#include <QtGui/QPushButton> -#include <QtGui/QWidget> +#include <QList> +#include <QScopedPointer> +#include <QString> +#include <QPushButton> +#include <QWidget> QT_BEGIN_NAMESPACE class QLineEdit; diff --git a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.cpp b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.cpp index 611c162c57..5a3f495960 100644 --- a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.cpp +++ b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.cpp @@ -37,7 +37,7 @@ #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> -#include <QtGui/QPushButton> +#include <QPushButton> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h index f2d1b53edf..3d6fd0ce72 100644 --- a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h +++ b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h @@ -33,8 +33,8 @@ #ifndef LINUXDEVICEFACTORYSELECTIONDIALOG_H #define LINUXDEVICEFACTORYSELECTIONDIALOG_H -#include <QtCore/QList> -#include <QtGui/QDialog> +#include <QList> +#include <QDialog> namespace RemoteLinux { class ILinuxDeviceConfigurationFactory; diff --git a/src/plugins/remotelinux/linuxdevicetestdialog.cpp b/src/plugins/remotelinux/linuxdevicetestdialog.cpp index 3d09e830af..b5daf66806 100644 --- a/src/plugins/remotelinux/linuxdevicetestdialog.cpp +++ b/src/plugins/remotelinux/linuxdevicetestdialog.cpp @@ -32,11 +32,11 @@ #include "linuxdevicetestdialog.h" #include "ui_linuxdevicetestdialog.h" -#include <QtGui/QBrush> -#include <QtGui/QColor> -#include <QtGui/QFont> -#include <QtGui/QPushButton> -#include <QtGui/QTextCharFormat> +#include <QBrush> +#include <QColor> +#include <QFont> +#include <QPushButton> +#include <QTextCharFormat> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdevicetestdialog.h b/src/plugins/remotelinux/linuxdevicetestdialog.h index 45b7bc7c87..001a11b75b 100644 --- a/src/plugins/remotelinux/linuxdevicetestdialog.h +++ b/src/plugins/remotelinux/linuxdevicetestdialog.h @@ -35,7 +35,7 @@ #include "linuxdevicetester.h" #include "remotelinux_export.h" -#include <QtGui/QDialog> +#include <QDialog> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h index 47508d8cc0..7e2ef787ab 100644 --- a/src/plugins/remotelinux/linuxdevicetester.h +++ b/src/plugins/remotelinux/linuxdevicetester.h @@ -34,8 +34,8 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QSharedPointer> QT_FORWARD_DECLARE_CLASS(QString) diff --git a/src/plugins/remotelinux/packageuploader.h b/src/plugins/remotelinux/packageuploader.h index 05e5806e4d..3c671257bd 100644 --- a/src/plugins/remotelinux/packageuploader.h +++ b/src/plugins/remotelinux/packageuploader.h @@ -33,9 +33,9 @@ #ifndef PACKAGEUPLOADER_H #define PACKAGEUPLOADER_H -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QObject> +#include <QSharedPointer> +#include <QString> #include <utils/ssh/sftpdefs.h> diff --git a/src/plugins/remotelinux/portlist.cpp b/src/plugins/remotelinux/portlist.cpp index 894dd3e93a..679f139220 100644 --- a/src/plugins/remotelinux/portlist.cpp +++ b/src/plugins/remotelinux/portlist.cpp @@ -31,9 +31,9 @@ **************************************************************************/ #include "portlist.h" -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QString> +#include <QList> +#include <QPair> +#include <QString> #include <cctype> diff --git a/src/plugins/remotelinux/profilesupdatedialog.cpp b/src/plugins/remotelinux/profilesupdatedialog.cpp index 6fb6dfdd39..eae1df7098 100644 --- a/src/plugins/remotelinux/profilesupdatedialog.cpp +++ b/src/plugins/remotelinux/profilesupdatedialog.cpp @@ -36,8 +36,8 @@ #include <qt4projectmanager/qt4nodes.h> -#include <QtCore/QDir> -#include <QtGui/QTableWidgetItem> +#include <QDir> +#include <QTableWidgetItem> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/profilesupdatedialog.h b/src/plugins/remotelinux/profilesupdatedialog.h index 2ab03af6cb..05c4b28702 100644 --- a/src/plugins/remotelinux/profilesupdatedialog.h +++ b/src/plugins/remotelinux/profilesupdatedialog.h @@ -33,10 +33,10 @@ #ifndef PROFILESUPDATEDIALOG_H #define PROFILESUPDATEDIALOG_H -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QString> -#include <QtGui/QDialog> +#include <QList> +#include <QPair> +#include <QString> +#include <QDialog> namespace RemoteLinux { class DeployableFilesPerProFile; diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp index 38a7825142..605e6a49a4 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp +++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp @@ -36,9 +36,9 @@ #include <coreplugin/icore.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QTimer> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> +#include <QTimer> +#include <QFileDialog> +#include <QMainWindow> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.h b/src/plugins/remotelinux/publickeydeploymentdialog.h index 6735f57df7..93eab8939f 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.h +++ b/src/plugins/remotelinux/publickeydeploymentdialog.h @@ -33,8 +33,8 @@ #include "remotelinux_export.h" -#include <QtCore/QSharedPointer> -#include <QtGui/QProgressDialog> +#include <QSharedPointer> +#include <QProgressDialog> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/remotelinux/remotelinux_export.h b/src/plugins/remotelinux/remotelinux_export.h index dc7238b9c5..253ba7252e 100644 --- a/src/plugins/remotelinux/remotelinux_export.h +++ b/src/plugins/remotelinux/remotelinux_export.h @@ -33,7 +33,7 @@ #ifndef REMOTE_LINUX_EXPORT_H #define REMOTE_LINUX_EXPORT_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(REMOTELINUX_LIBRARY) # define REMOTELINUX_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/remotelinux/remotelinuxapplicationrunner.h b/src/plugins/remotelinux/remotelinuxapplicationrunner.h index e4adc6d434..86cd9cb66a 100644 --- a/src/plugins/remotelinux/remotelinuxapplicationrunner.h +++ b/src/plugins/remotelinux/remotelinuxapplicationrunner.h @@ -33,8 +33,8 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QSharedPointer> namespace Utils { class SshConnection; diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp index 8c46354768..7fa49dbb9d 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp @@ -31,11 +31,11 @@ **************************************************************************/ #include "remotelinuxcustomcommanddeploymentstep.h" -#include <QtCore/QString> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QVBoxLayout> +#include <QString> +#include <QHBoxLayout> +#include <QLabel> +#include <QLineEdit> +#include <QVBoxLayout> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp index a7f2a8e336..29653c84bd 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QString> +#include <QString> using namespace Utils; diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp index 43e94f7441..73b7cef754 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp @@ -44,8 +44,8 @@ #include <qt4projectmanager/qt4buildconfiguration.h> #include <utils/qtcassert.h> -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> +#include <QPointer> +#include <QSharedPointer> using namespace Utils; using namespace Debugger; diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.h b/src/plugins/remotelinux/remotelinuxdebugsupport.h index 57377e03c0..7236248e3c 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.h +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.h @@ -34,7 +34,7 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> +#include <QObject> namespace Debugger { class DebuggerEngine; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index 6ad89dbfe0..d59af482f9 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h @@ -39,7 +39,7 @@ #include <projectexplorer/buildsteplist.h> #include <projectexplorer/deployconfiguration.h> -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace RemoteLinux { class AbstractEmbeddedLinuxTarget; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp index 061de54ec3..7402794d6c 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp @@ -35,7 +35,7 @@ #include "genericdirectuploadstep.h" #include "remotelinuxdeployconfiguration.h" -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp index 4511d7bab3..30f71dfc52 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp @@ -43,7 +43,7 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtGui/QTreeView> +#include <QTreeView> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h index 6d7cbb378d..5e80faf697 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentreader.h +++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h @@ -34,8 +34,8 @@ #include <utils/environment.h> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QSharedPointer> namespace Utils { class SshRemoteProcessRunner; diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp index b037685753..b2c7d20c3a 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QByteArray> +#include <QByteArray> using namespace Utils; diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h index 6c3c795be0..ebdd0bf20d 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h @@ -34,9 +34,9 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QObject> +#include <QSharedPointer> +#include <QString> namespace RemoteLinux { class LinuxDeviceConfiguration; diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index c637cd1892..8305e306f0 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -54,8 +54,8 @@ #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QAction> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/remotelinuxprocessesdialog.cpp b/src/plugins/remotelinux/remotelinuxprocessesdialog.cpp index 645ba3bf2d..1bab0ec631 100644 --- a/src/plugins/remotelinux/remotelinuxprocessesdialog.cpp +++ b/src/plugins/remotelinux/remotelinuxprocessesdialog.cpp @@ -34,8 +34,8 @@ #include "remotelinuxprocesslist.h" -#include <QtGui/QMessageBox> -#include <QtGui/QSortFilterProxyModel> +#include <QMessageBox> +#include <QSortFilterProxyModel> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/remotelinuxprocessesdialog.h b/src/plugins/remotelinux/remotelinuxprocessesdialog.h index 09503d6717..062b3834a5 100644 --- a/src/plugins/remotelinux/remotelinuxprocessesdialog.h +++ b/src/plugins/remotelinux/remotelinuxprocessesdialog.h @@ -33,7 +33,7 @@ #include "remotelinux_export.h" -#include <QtGui/QDialog> +#include <QDialog> namespace RemoteLinux { class AbstractRemoteLinuxProcessList; diff --git a/src/plugins/remotelinux/remotelinuxprocesslist.cpp b/src/plugins/remotelinux/remotelinuxprocesslist.cpp index a20f287b24..6e85a4e848 100644 --- a/src/plugins/remotelinux/remotelinuxprocesslist.cpp +++ b/src/plugins/remotelinux/remotelinuxprocesslist.cpp @@ -35,8 +35,8 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QByteArray> -#include <QtCore/QString> +#include <QByteArray> +#include <QString> using namespace Utils; diff --git a/src/plugins/remotelinux/remotelinuxprocesslist.h b/src/plugins/remotelinux/remotelinuxprocesslist.h index dcb305aca5..d0bcca22c9 100644 --- a/src/plugins/remotelinux/remotelinuxprocesslist.h +++ b/src/plugins/remotelinux/remotelinuxprocesslist.h @@ -33,9 +33,9 @@ #include "remotelinux_export.h" -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QAbstractTableModel> +#include <QList> +#include <QSharedPointer> namespace RemoteLinux { class LinuxDeviceConfiguration; diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp index 4eda7d4113..ebc07a51a3 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp @@ -39,9 +39,9 @@ #include <qt4projectmanager/qt4target.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QFileInfo> +#include <QString> +#include <QStringList> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp index 9d81a735d3..721e2c720f 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp @@ -44,17 +44,17 @@ #include <qt4projectmanager/qt4target.h> #include <utils/detailswidget.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QFormLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QCoreApplication> +#include <QDir> +#include <QCheckBox> +#include <QComboBox> +#include <QFormLayout> +#include <QGroupBox> +#include <QHBoxLayout> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> +#include <QPushButton> using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h index 8ec18e2a8d..553987c8a5 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h @@ -34,7 +34,7 @@ #include "remotelinux_export.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QVBoxLayout; diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp index 8a22d8df71..c296eab903 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp +++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp @@ -37,8 +37,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcassert.h> -#include <QtCore/QString> -#include <QtGui/QIcon> +#include <QString> +#include <QIcon> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxsettingspages.cpp b/src/plugins/remotelinux/remotelinuxsettingspages.cpp index d69d39c375..8f3c0b9b51 100644 --- a/src/plugins/remotelinux/remotelinuxsettingspages.cpp +++ b/src/plugins/remotelinux/remotelinuxsettingspages.cpp @@ -33,9 +33,9 @@ #include "linuxdeviceconfigurationssettingswidget.h" #include "remotelinux_constants.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QString> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QString> +#include <QIcon> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp b/src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp index 2b7dd0b80b..ade18dfcbb 100644 --- a/src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp +++ b/src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp @@ -35,7 +35,7 @@ #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QString> +#include <QString> using namespace Utils; diff --git a/src/plugins/remotelinux/remotelinuxusedportsgatherer.h b/src/plugins/remotelinux/remotelinuxusedportsgatherer.h index 6cfef9e795..16e40f9965 100644 --- a/src/plugins/remotelinux/remotelinuxusedportsgatherer.h +++ b/src/plugins/remotelinux/remotelinuxusedportsgatherer.h @@ -33,9 +33,9 @@ #include "remotelinux_export.h" -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QList> +#include <QObject> +#include <QSharedPointer> QT_FORWARD_DECLARE_CLASS(QString) diff --git a/src/plugins/remotelinux/remotelinuxutils.cpp b/src/plugins/remotelinux/remotelinuxutils.cpp index e8605fcd55..327af7a2e4 100644 --- a/src/plugins/remotelinux/remotelinuxutils.cpp +++ b/src/plugins/remotelinux/remotelinuxutils.cpp @@ -39,9 +39,9 @@ #include <qt4projectmanager/qt4target.h> #include <qtsupport/baseqtversion.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QCoreApplication> +#include <QList> +#include <QString> using namespace ExtensionSystem; using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxutils.h b/src/plugins/remotelinux/remotelinuxutils.h index c1ecd79bc3..cec48c67c6 100644 --- a/src/plugins/remotelinux/remotelinuxutils.h +++ b/src/plugins/remotelinux/remotelinuxutils.h @@ -34,7 +34,7 @@ #include "remotelinux_export.h" -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace ProjectExplorer { class Target; diff --git a/src/plugins/remotelinux/sshkeycreationdialog.cpp b/src/plugins/remotelinux/sshkeycreationdialog.cpp index 8b83cdb526..f0f3f4bb5a 100644 --- a/src/plugins/remotelinux/sshkeycreationdialog.cpp +++ b/src/plugins/remotelinux/sshkeycreationdialog.cpp @@ -36,12 +36,12 @@ #include <utils/ssh/sshkeygenerator.h> #include <utils/fileutils.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtGui/QApplication> -#include <QtGui/QDesktopServices> -#include <QtGui/QMessageBox> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QApplication> +#include <QDesktopServices> +#include <QMessageBox> using namespace Utils; using namespace RemoteLinux::Internal; diff --git a/src/plugins/remotelinux/sshkeycreationdialog.h b/src/plugins/remotelinux/sshkeycreationdialog.h index e83ba52036..2acb22480e 100644 --- a/src/plugins/remotelinux/sshkeycreationdialog.h +++ b/src/plugins/remotelinux/sshkeycreationdialog.h @@ -32,7 +32,7 @@ #ifndef SSHKEYCREATIONDIALOG_H #define SSHKEYCREATIONDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace Utils { class SshKeyGenerator; diff --git a/src/plugins/remotelinux/sshkeydeployer.cpp b/src/plugins/remotelinux/sshkeydeployer.cpp index 8d1b7f5d85..955373c266 100644 --- a/src/plugins/remotelinux/sshkeydeployer.cpp +++ b/src/plugins/remotelinux/sshkeydeployer.cpp @@ -33,8 +33,8 @@ #include <utils/ssh/sshremoteprocessrunner.h> #include <utils/fileutils.h> -#include <QtCore/QFile> -#include <QtCore/QSharedPointer> +#include <QFile> +#include <QSharedPointer> using namespace Utils; diff --git a/src/plugins/remotelinux/sshkeydeployer.h b/src/plugins/remotelinux/sshkeydeployer.h index a28e1e8c87..5debd0e194 100644 --- a/src/plugins/remotelinux/sshkeydeployer.h +++ b/src/plugins/remotelinux/sshkeydeployer.h @@ -33,7 +33,7 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> +#include <QObject> namespace Utils { class SshConnectionParameters; diff --git a/src/plugins/remotelinux/startgdbserverdialog.cpp b/src/plugins/remotelinux/startgdbserverdialog.cpp index 43c990ce4b..bbd0619c7d 100644 --- a/src/plugins/remotelinux/startgdbserverdialog.cpp +++ b/src/plugins/remotelinux/startgdbserverdialog.cpp @@ -47,27 +47,27 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QVariant> -#include <QtCore/QSettings> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QComboBox> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QFormLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QSpacerItem> -#include <QtGui/QTableView> -#include <QtGui/QTextBrowser> -#include <QtGui/QVBoxLayout> +#include <QVariant> +#include <QSettings> + +#include <QAction> +#include <QApplication> +#include <QComboBox> +#include <QDialog> +#include <QDialogButtonBox> +#include <QFormLayout> +#include <QGridLayout> +#include <QHBoxLayout> +#include <QHeaderView> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> +#include <QPushButton> +#include <QSortFilterProxyModel> +#include <QSpacerItem> +#include <QTableView> +#include <QTextBrowser> +#include <QVBoxLayout> using namespace Core; using namespace Utils; diff --git a/src/plugins/remotelinux/startgdbserverdialog.h b/src/plugins/remotelinux/startgdbserverdialog.h index e78e706113..e22f207c31 100644 --- a/src/plugins/remotelinux/startgdbserverdialog.h +++ b/src/plugins/remotelinux/startgdbserverdialog.h @@ -35,7 +35,7 @@ #include "remotelinux_export.h" -#include <QtGui/QDialog> +#include <QDialog> namespace RemoteLinux { diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index efd4cfc293..c3f9b37fc2 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -37,10 +37,10 @@ #include <projectexplorer/project.h> #include <projectexplorer/target.h> -#include <QtCore/QDateTime> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <QDateTime> +#include <QDir> +#include <QFile> +#include <QFileInfo> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h index 166fdc9efa..6de2cc6611 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h @@ -34,8 +34,8 @@ #include "linuxdeviceconfiguration.h" -#include <QtCore/QAbstractListModel> -#include <QtCore/QSharedPointer> +#include <QAbstractListModel> +#include <QSharedPointer> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp index 1574d7adac..85c64688d4 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.cpp +++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp @@ -38,8 +38,8 @@ #include <coreplugin/fileiconprovider.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QFileInfo> -#include <QtCore/qdebug.h> +#include <QFileInfo> +#include <qdebug.h> using namespace ResourceEditor::Internal; using namespace ResourceEditor::Constants; diff --git a/src/plugins/resourceeditor/resourceeditorfactory.h b/src/plugins/resourceeditor/resourceeditorfactory.h index f85e5f8a12..376232c1bd 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.h +++ b/src/plugins/resourceeditor/resourceeditorfactory.h @@ -36,7 +36,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/icontext.h> -#include <QtCore/QStringList> +#include <QStringList> namespace ResourceEditor { namespace Internal { diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 1e2b7e426d..a9d2e2ece4 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -47,9 +47,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QtPlugin> -#include <QtCore/QCoreApplication> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QCoreApplication> +#include <QAction> using namespace ResourceEditor::Internal; diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 97d02941f8..85d415cd7f 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -42,13 +42,13 @@ #include <utils/reloadpromptutils.h> #include <utils/fileutils.h> -#include <QtCore/QTemporaryFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/qdebug.h> -#include <QtGui/QHBoxLayout> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> +#include <QTemporaryFile> +#include <QFileInfo> +#include <QDir> +#include <qdebug.h> +#include <QHBoxLayout> +#include <QMainWindow> +#include <QMenu> namespace ResourceEditor { namespace Internal { diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index d84060c062..55ce8a3e6c 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -36,7 +36,7 @@ #include <coreplugin/ifile.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtCore/QPointer> +#include <QPointer> QT_BEGIN_NAMESPACE class QMenu; diff --git a/src/plugins/subversion/checkoutwizard.cpp b/src/plugins/subversion/checkoutwizard.cpp index b2ed317d60..ef708ab4b8 100644 --- a/src/plugins/subversion/checkoutwizard.cpp +++ b/src/plugins/subversion/checkoutwizard.cpp @@ -40,7 +40,7 @@ #include <vcsbase/vcsconfigurationpage.h> #include <utils/qtcassert.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Subversion { namespace Internal { diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp index 9cfa240517..a091a109a4 100644 --- a/src/plugins/subversion/settingspage.cpp +++ b/src/plugins/subversion/settingspage.cpp @@ -39,9 +39,9 @@ #include <vcsbase/vcsbaseconstants.h> #include <utils/pathchooser.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QTextStream> -#include <QtGui/QFileDialog> +#include <QCoreApplication> +#include <QTextStream> +#include <QFileDialog> using namespace Subversion::Internal; using namespace Utils; diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h index 91151ffeb3..91ef2238b1 100644 --- a/src/plugins/subversion/settingspage.h +++ b/src/plugins/subversion/settingspage.h @@ -37,9 +37,9 @@ #include <vcsbase/vcsbaseoptionspage.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> -#include <QtCore/QString> +#include <QWidget> +#include <QPointer> +#include <QString> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h index 179afe1b99..4d30ca4de1 100644 --- a/src/plugins/subversion/subversionconstants.h +++ b/src/plugins/subversion/subversionconstants.h @@ -33,7 +33,7 @@ #ifndef SUBVERSION_CONSTANTS_H #define SUBVERSION_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Subversion { namespace Constants { diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp index 1c346a01b0..b2afe60276 100644 --- a/src/plugins/subversion/subversioncontrol.cpp +++ b/src/plugins/subversion/subversioncontrol.cpp @@ -36,7 +36,7 @@ #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Subversion; using namespace Subversion::Internal; diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp index ac6e8c4ea5..10a5ef2185 100644 --- a/src/plugins/subversion/subversioneditor.cpp +++ b/src/plugins/subversion/subversioneditor.cpp @@ -39,10 +39,10 @@ #include <utils/qtcassert.h> #include <vcsbase/diffhighlighter.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QFileInfo> +#include <QTextCursor> +#include <QTextBlock> using namespace Subversion; using namespace Subversion::Internal; diff --git a/src/plugins/subversion/subversioneditor.h b/src/plugins/subversion/subversioneditor.h index 4db584228a..1fc930329f 100644 --- a/src/plugins/subversion/subversioneditor.h +++ b/src/plugins/subversion/subversioneditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Subversion { namespace Internal { diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 29f8196681..326b145f6c 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -64,21 +64,21 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTemporaryFile> -#include <QtCore/QTextCodec> -#include <QtCore/QtPlugin> -#include <QtCore/QProcessEnvironment> -#include <QtCore/QUrl> -#include <QtCore/QXmlStreamReader> -#include <QtGui/QAction> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QInputDialog> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTemporaryFile> +#include <QTextCodec> +#include <QtPlugin> +#include <QProcessEnvironment> +#include <QUrl> +#include <QXmlStreamReader> +#include <QAction> +#include <QFileDialog> +#include <QMainWindow> +#include <QMenu> +#include <QMessageBox> +#include <QInputDialog> #include <limits.h> namespace Subversion { diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h index 999730b160..e348752101 100644 --- a/src/plugins/subversion/subversionplugin.h +++ b/src/plugins/subversion/subversionplugin.h @@ -36,7 +36,7 @@ #include "subversionsettings.h" #include <vcsbase/vcsbaseplugin.h> -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QDir; diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp index 43c342318a..24fe5a7102 100644 --- a/src/plugins/subversion/subversionsettings.cpp +++ b/src/plugins/subversion/subversionsettings.cpp @@ -32,7 +32,7 @@ #include "subversionsettings.h" -#include <QtCore/QSettings> +#include <QSettings> static const char groupC[] = "Subversion"; static const char commandKeyC[] = "Command"; diff --git a/src/plugins/subversion/subversionsettings.h b/src/plugins/subversion/subversionsettings.h index dbcac325d2..383e04c5a2 100644 --- a/src/plugins/subversion/subversionsettings.h +++ b/src/plugins/subversion/subversionsettings.h @@ -33,7 +33,7 @@ #ifndef SUBVERSIONSETTINGS_H #define SUBVERSIONSETTINGS_H -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/subversion/subversionsubmiteditor.h b/src/plugins/subversion/subversionsubmiteditor.h index 5edb098e1f..25b0d8ad41 100644 --- a/src/plugins/subversion/subversionsubmiteditor.h +++ b/src/plugins/subversion/subversionsubmiteditor.h @@ -33,8 +33,8 @@ #ifndef SUBVERSIONSUBMITEDITOR_H #define SUBVERSIONSUBMITEDITOR_H -#include <QtCore/QPair> -#include <QtCore/QStringList> +#include <QPair> +#include <QStringList> #include <vcsbase/vcsbasesubmiteditor.h> diff --git a/src/plugins/tasklist/stopmonitoringhandler.cpp b/src/plugins/tasklist/stopmonitoringhandler.cpp index 48f5e13ed6..f0b57ea3f2 100644 --- a/src/plugins/tasklist/stopmonitoringhandler.cpp +++ b/src/plugins/tasklist/stopmonitoringhandler.cpp @@ -38,8 +38,8 @@ #include <projectexplorer/task.h> #include <utils/qtcassert.h> -#include <QtGui/QAction> -#include <QtCore/QCoreApplication> +#include <QAction> +#include <QCoreApplication> using namespace TaskList; using namespace TaskList::Internal; diff --git a/src/plugins/tasklist/taskfilefactory.cpp b/src/plugins/tasklist/taskfilefactory.cpp index b0e19aa6b0..3bdcb8be11 100644 --- a/src/plugins/tasklist/taskfilefactory.cpp +++ b/src/plugins/tasklist/taskfilefactory.cpp @@ -39,8 +39,8 @@ #include <coreplugin/id.h> #include <coreplugin/filemanager.h> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> +#include <QMainWindow> +#include <QMessageBox> using namespace TaskList::Internal; diff --git a/src/plugins/tasklist/taskfilefactory.h b/src/plugins/tasklist/taskfilefactory.h index 7f281d9b30..857ec455fd 100644 --- a/src/plugins/tasklist/taskfilefactory.h +++ b/src/plugins/tasklist/taskfilefactory.h @@ -36,7 +36,7 @@ #include <coreplugin/ifilefactory.h> #include <coreplugin/ifile.h> -#include <QtCore/QStringList> +#include <QStringList> namespace ProjectExplorer { class Project; diff --git a/src/plugins/tasklist/tasklist_export.h b/src/plugins/tasklist/tasklist_export.h index 381e30bec6..6e1dc0d383 100644 --- a/src/plugins/tasklist/tasklist_export.h +++ b/src/plugins/tasklist/tasklist_export.h @@ -33,7 +33,7 @@ #ifndef TASKLIST_TASKLIST_EXPORT_H #define TASKLIST_TASKLIST_EXPORT_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(TASKLIST_LIBRARY) # define TASKLIST_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/tasklist/tasklistplugin.cpp b/src/plugins/tasklist/tasklistplugin.cpp index b8690edb83..6872a5e03e 100644 --- a/src/plugins/tasklist/tasklistplugin.cpp +++ b/src/plugins/tasklist/tasklistplugin.cpp @@ -44,9 +44,9 @@ #include <projectexplorer/task.h> #include <projectexplorer/taskhub.h> -#include <QtCore/QDir> -#include <QtCore/QStringList> -#include <QtCore/QtPlugin> +#include <QDir> +#include <QStringList> +#include <QtPlugin> namespace { diff --git a/src/plugins/texteditor/autocompleter.cpp b/src/plugins/texteditor/autocompleter.cpp index 1430aa5a5d..221531a9b9 100644 --- a/src/plugins/texteditor/autocompleter.cpp +++ b/src/plugins/texteditor/autocompleter.cpp @@ -35,8 +35,8 @@ #include "texteditorsettings.h" #include "tabsettings.h" -#include <QtCore/QDebug> -#include <QtGui/QTextCursor> +#include <QDebug> +#include <QTextCursor> using namespace TextEditor; diff --git a/src/plugins/texteditor/autocompleter.h b/src/plugins/texteditor/autocompleter.h index e8af364fc1..d9631c808b 100644 --- a/src/plugins/texteditor/autocompleter.h +++ b/src/plugins/texteditor/autocompleter.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtCore/QChar> -#include <QtCore/QString> +#include <QChar> +#include <QString> QT_BEGIN_NAMESPACE class QTextCursor; diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 47422db53c..3a328c6183 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -48,19 +48,19 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDirIterator> -#include <QtCore/QSettings> -#include <QtCore/QHash> -#include <QtCore/QPair> -#include <QtGui/QFileDialog> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QMainWindow> -#include <QtGui/QPushButton> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QDirIterator> +#include <QSettings> +#include <QHash> +#include <QPair> +#include <QFileDialog> +#include <QCheckBox> +#include <QComboBox> +#include <QHBoxLayout> +#include <QLabel> +#include <QMainWindow> +#include <QPushButton> +#include <QTextBlock> using namespace Utils; using namespace Find; diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index 0be41d278c..8c22311898 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -39,10 +39,10 @@ #include <find/searchresultwindow.h> #include <utils/filesearch.h> -#include <QtGui/QStringListModel> +#include <QStringListModel> -#include <QtCore/QFutureWatcher> -#include <QtCore/QPointer> +#include <QFutureWatcher> +#include <QPointer> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/texteditor/basefilefind_p.h b/src/plugins/texteditor/basefilefind_p.h index 7157bcd8f1..754378ceb0 100644 --- a/src/plugins/texteditor/basefilefind_p.h +++ b/src/plugins/texteditor/basefilefind_p.h @@ -35,8 +35,8 @@ #include <find/ifindfilter.h> -#include <QtCore/QVariant> -#include <QtGui/QLabel> +#include <QVariant> +#include <QLabel> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index e2f6badd46..ff9c8ada74 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -43,7 +43,7 @@ #include <coreplugin/id.h> #include <debugger/debuggerconstants.h> -#include <QtCore/QPoint> +#include <QPoint> using namespace TextEditor; using namespace Core; diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h index 0c73b81ed8..6676f30333 100644 --- a/src/plugins/texteditor/basehoverhandler.h +++ b/src/plugins/texteditor/basehoverhandler.h @@ -36,8 +36,8 @@ #include "texteditor_global.h" #include "helpitem.h" -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> QT_BEGIN_NAMESPACE class QPoint; diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp index 4f6f4c1c7d..0336640289 100644 --- a/src/plugins/texteditor/basetextdocument.cpp +++ b/src/plugins/texteditor/basetextdocument.cpp @@ -41,16 +41,16 @@ #include "syntaxhighlighter.h" #include "texteditorconstants.h" -#include <QtCore/QStringList> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtCore/QTextCodec> -#include <QtCore/QFutureInterface> -#include <QtGui/QMainWindow> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QApplication> +#include <QStringList> +#include <QFile> +#include <QDir> +#include <QFileInfo> +#include <QTextStream> +#include <QTextCodec> +#include <QFutureInterface> +#include <QMainWindow> +#include <QSyntaxHighlighter> +#include <QApplication> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> diff --git a/src/plugins/texteditor/basetextdocumentlayout.h b/src/plugins/texteditor/basetextdocumentlayout.h index d4c78667dc..83e202b0c9 100644 --- a/src/plugins/texteditor/basetextdocumentlayout.h +++ b/src/plugins/texteditor/basetextdocumentlayout.h @@ -37,8 +37,8 @@ #include "itexteditor.h" -#include <QtGui/QTextBlockUserData> -#include <QtGui/QPlainTextDocumentLayout> +#include <QTextBlockUserData> +#include <QPlainTextDocumentLayout> namespace TextEditor { diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 1687164c7c..a466b0eeea 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -72,35 +72,35 @@ #include <utils/qtcassert.h> #include <utils/stylehelper.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QTextCodec> -#include <QtCore/QFile> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtCore/QTimeLine> -#include <QtCore/QTime> -#include <QtCore/QMimeData> -#include <QtGui/QAbstractTextDocumentLayout> -#include <QtGui/QApplication> -#include <QtGui/QKeyEvent> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QPainter> -#include <QtGui/QPrinter> -#include <QtGui/QPrintDialog> -#include <QtGui/QScrollBar> -#include <QtGui/QShortcut> -#include <QtGui/QStyle> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocumentFragment> -#include <QtGui/QTextBlock> -#include <QtGui/QTextLayout> -#include <QtGui/QToolBar> -#include <QtGui/QInputDialog> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QClipboard> +#include <QCoreApplication> +#include <QTextCodec> +#include <QFile> +#include <QDebug> +#include <QTimer> +#include <QTimeLine> +#include <QTime> +#include <QMimeData> +#include <QAbstractTextDocumentLayout> +#include <QApplication> +#include <QKeyEvent> +#include <QLabel> +#include <QLayout> +#include <QPainter> +#include <QPrinter> +#include <QPrintDialog> +#include <QScrollBar> +#include <QShortcut> +#include <QStyle> +#include <QSyntaxHighlighter> +#include <QTextCursor> +#include <QTextDocumentFragment> +#include <QTextBlock> +#include <QTextLayout> +#include <QToolBar> +#include <QInputDialog> +#include <QMenu> +#include <QMessageBox> +#include <QClipboard> //#define DO_FOO diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 708d82c867..bc2b9dfbea 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -39,7 +39,7 @@ #include <find/ifindsupport.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtGui/QPlainTextEdit> +#include <QPlainTextEdit> QT_BEGIN_NAMESPACE class QToolBar; diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/basetexteditor_p.h index 181a072277..3d9e00f931 100644 --- a/src/plugins/texteditor/basetexteditor_p.h +++ b/src/plugins/texteditor/basetexteditor_p.h @@ -41,10 +41,10 @@ #include <utils/changeset.h> -#include <QtCore/QBasicTimer> -#include <QtCore/QSharedData> -#include <QtCore/QPointer> -#include <QtCore/QScopedPointer> +#include <QBasicTimer> +#include <QSharedData> +#include <QPointer> +#include <QScopedPointer> namespace TextEditor { diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h index 0677afc929..28f600a8e5 100644 --- a/src/plugins/texteditor/basetextmark.h +++ b/src/plugins/texteditor/basetextmark.h @@ -38,8 +38,8 @@ #include <utils/fileutils.h> -#include <QtCore/QWeakPointer> -#include <QtCore/QHash> +#include <QWeakPointer> +#include <QHash> QT_BEGIN_NAMESPACE class QTextBlock; diff --git a/src/plugins/texteditor/behaviorsettings.cpp b/src/plugins/texteditor/behaviorsettings.cpp index 3078c56888..48d44a5c8d 100644 --- a/src/plugins/texteditor/behaviorsettings.cpp +++ b/src/plugins/texteditor/behaviorsettings.cpp @@ -34,8 +34,8 @@ #include <utils/settingsutils.h> -#include <QtCore/QSettings> -#include <QtCore/QString> +#include <QSettings> +#include <QString> static const char mouseNavigationKey[] = "MouseNavigation"; static const char scrollWheelZoomingKey[] = "ScrollWheelZooming"; diff --git a/src/plugins/texteditor/behaviorsettings.h b/src/plugins/texteditor/behaviorsettings.h index 07683110f2..d7bf88ab2f 100644 --- a/src/plugins/texteditor/behaviorsettings.h +++ b/src/plugins/texteditor/behaviorsettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariantMap> +#include <QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp index 85a0aefc82..1cf6b379b4 100644 --- a/src/plugins/texteditor/behaviorsettingspage.cpp +++ b/src/plugins/texteditor/behaviorsettingspage.cpp @@ -46,8 +46,8 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QSettings> -#include <QtCore/QTextCodec> +#include <QSettings> +#include <QTextCodec> using namespace TextEditor; diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp index ff4674e684..4d954544ed 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.cpp +++ b/src/plugins/texteditor/behaviorsettingswidget.cpp @@ -39,11 +39,11 @@ #include <texteditor/behaviorsettings.h> #include <texteditor/extraencodingsettings.h> -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QByteArray> -#include <QtCore/QTextCodec> -#include <QtCore/QTextStream> +#include <QList> +#include <QString> +#include <QByteArray> +#include <QTextCodec> +#include <QTextStream> #include <algorithm> #include <functional> diff --git a/src/plugins/texteditor/behaviorsettingswidget.h b/src/plugins/texteditor/behaviorsettingswidget.h index 26ce75f437..486a22b7c6 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.h +++ b/src/plugins/texteditor/behaviorsettingswidget.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QTextCodec; diff --git a/src/plugins/texteditor/circularclipboard.h b/src/plugins/texteditor/circularclipboard.h index dd8509f495..118c0854ba 100644 --- a/src/plugins/texteditor/circularclipboard.h +++ b/src/plugins/texteditor/circularclipboard.h @@ -33,8 +33,8 @@ #ifndef CIRCULARCLIPBOARD_H #define CIRCULARCLIPBOARD_H -#include <QtCore/QList> -#include <QtCore/QMimeData> +#include <QList> +#include <QMimeData> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/codeassist/basicproposalitem.cpp b/src/plugins/texteditor/codeassist/basicproposalitem.cpp index 36c3fc78ab..f2293d1429 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitem.cpp +++ b/src/plugins/texteditor/codeassist/basicproposalitem.cpp @@ -35,7 +35,7 @@ #include <texteditor/basetexteditor.h> #include <texteditor/quickfix.h> -#include <QtGui/QTextCursor> +#include <QTextCursor> using namespace TextEditor; diff --git a/src/plugins/texteditor/codeassist/basicproposalitem.h b/src/plugins/texteditor/codeassist/basicproposalitem.h index d1f1aa5c36..0ff5efc1b6 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitem.h +++ b/src/plugins/texteditor/codeassist/basicproposalitem.h @@ -37,8 +37,8 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QVariant> -#include <QtGui/QIcon> +#include <QVariant> +#include <QIcon> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp index a2cdeadf50..041954419d 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp @@ -35,10 +35,10 @@ #include "texteditorsettings.h" #include "completionsettings.h" -#include <QtCore/QDebug> -#include <QtCore/QRegExp> -#include <QtCore/QtAlgorithms> -#include <QtCore/QHash> +#include <QDebug> +#include <QRegExp> +#include <QtAlgorithms> +#include <QHash> #include <algorithm> diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h index 0ea79c2872..d3562d2d0e 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h @@ -37,9 +37,9 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QList> -#include <QtCore/QHash> -#include <QtCore/QPair> +#include <QList> +#include <QHash> +#include <QPair> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp index d6b21593a0..4c0256b346 100644 --- a/src/plugins/texteditor/codeassist/codeassistant.cpp +++ b/src/plugins/texteditor/codeassist/codeassistant.cpp @@ -45,11 +45,11 @@ #include <texteditor/completionsettings.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QTimer> -#include <QtCore/QDebug> -#include <QtGui/QKeyEvent> +#include <QObject> +#include <QList> +#include <QTimer> +#include <QDebug> +#include <QKeyEvent> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/codeassist/completionassistprovider.cpp b/src/plugins/texteditor/codeassist/completionassistprovider.cpp index 3a3bd7729d..aed63c3bff 100644 --- a/src/plugins/texteditor/codeassist/completionassistprovider.cpp +++ b/src/plugins/texteditor/codeassist/completionassistprovider.cpp @@ -32,7 +32,7 @@ #include "completionassistprovider.h" -#include <QtCore/QChar> +#include <QChar> using namespace TextEditor; diff --git a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp index 8592e59ec9..2dc94176be 100644 --- a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp +++ b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp @@ -34,9 +34,9 @@ #include <texteditor/convenience.h> -#include <QtCore/QThread> -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> +#include <QThread> +#include <QTextDocument> +#include <QTextCursor> using namespace TextEditor; diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp index 87628a0246..3493b97338 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp @@ -36,15 +36,15 @@ #include <utils/faketooltip.h> -#include <QtCore/QDebug> -#include <QtGui/QApplication> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDesktopWidget> -#include <QtGui/QKeyEvent> -#include <QtGui/QShortcutEvent> +#include <QDebug> +#include <QApplication> +#include <QLabel> +#include <QToolButton> +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QDesktopWidget> +#include <QKeyEvent> +#include <QShortcutEvent> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 8b0951ee84..7e53d2dda9 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -42,20 +42,20 @@ #include <utils/faketooltip.h> -#include <QtCore/QRect> -#include <QtCore/QLatin1String> -#include <QtCore/QAbstractListModel> -#include <QtCore/QPointer> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtGui/QApplication> -#include <QtGui/QVBoxLayout> -#include <QtGui/QListView> -#include <QtGui/QAbstractItemView> -#include <QtGui/QScrollBar> -#include <QtGui/QKeyEvent> -#include <QtGui/QDesktopWidget> -#include <QtGui/QLabel> +#include <QRect> +#include <QLatin1String> +#include <QAbstractListModel> +#include <QPointer> +#include <QDebug> +#include <QTimer> +#include <QApplication> +#include <QVBoxLayout> +#include <QListView> +#include <QAbstractItemView> +#include <QScrollBar> +#include <QKeyEvent> +#include <QDesktopWidget> +#include <QLabel> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistinterface.h b/src/plugins/texteditor/codeassist/iassistinterface.h index 04e0ae06d7..7c6b2d6d9e 100644 --- a/src/plugins/texteditor/codeassist/iassistinterface.h +++ b/src/plugins/texteditor/codeassist/iassistinterface.h @@ -37,7 +37,7 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/codeassist/iassistproposalitem.h b/src/plugins/texteditor/codeassist/iassistproposalitem.h index a924e08c45..b736163ce4 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalitem.h +++ b/src/plugins/texteditor/codeassist/iassistproposalitem.h @@ -35,7 +35,7 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QString> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistproposalmodel.h b/src/plugins/texteditor/codeassist/iassistproposalmodel.h index 5d65c0d818..c121af3272 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalmodel.h +++ b/src/plugins/texteditor/codeassist/iassistproposalmodel.h @@ -35,7 +35,7 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QString> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistproposalwidget.h b/src/plugins/texteditor/codeassist/iassistproposalwidget.h index 1db293babd..015f5b4c6a 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalwidget.h +++ b/src/plugins/texteditor/codeassist/iassistproposalwidget.h @@ -37,7 +37,7 @@ #include <texteditor/texteditor_global.h> -#include <QtGui/QFrame> +#include <QFrame> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistprovider.h b/src/plugins/texteditor/codeassist/iassistprovider.h index 17b8eee043..9da5bcc7fc 100644 --- a/src/plugins/texteditor/codeassist/iassistprovider.h +++ b/src/plugins/texteditor/codeassist/iassistprovider.h @@ -36,7 +36,7 @@ #include <texteditor/texteditor_global.h> #include <coreplugin/id.h> -#include <QtCore/QObject> +#include <QObject> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/igenericproposalmodel.h b/src/plugins/texteditor/codeassist/igenericproposalmodel.h index 746b9242a9..31a6628e17 100644 --- a/src/plugins/texteditor/codeassist/igenericproposalmodel.h +++ b/src/plugins/texteditor/codeassist/igenericproposalmodel.h @@ -38,7 +38,7 @@ #include <texteditor/texteditor_global.h> -#include <QtGui/QIcon> +#include <QIcon> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp index 0f48b5c7d4..1c20456b17 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp +++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp @@ -40,8 +40,8 @@ // @TODO: Move... #include <texteditor/quickfix.h> -#include <QtCore/QMap> -#include <QtCore/QDebug> +#include <QMap> +#include <QDebug> using namespace TextEditor; diff --git a/src/plugins/texteditor/codeassist/quickfixassistprovider.h b/src/plugins/texteditor/codeassist/quickfixassistprovider.h index 7da5388612..5d9d4c2efa 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprovider.h +++ b/src/plugins/texteditor/codeassist/quickfixassistprovider.h @@ -35,7 +35,7 @@ #include "iassistprovider.h" -#include <QtCore/QList> +#include <QList> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/runner.h b/src/plugins/texteditor/codeassist/runner.h index d81710d1f3..2dc7ba75c6 100644 --- a/src/plugins/texteditor/codeassist/runner.h +++ b/src/plugins/texteditor/codeassist/runner.h @@ -35,7 +35,7 @@ #include "iassistproposalwidget.h" -#include <QtCore/QThread> +#include <QThread> namespace TextEditor { diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp index b72d63d3dd..b9a254461d 100644 --- a/src/plugins/texteditor/codecselector.cpp +++ b/src/plugins/texteditor/codecselector.cpp @@ -33,12 +33,12 @@ #include "codecselector.h" #include "basetextdocument.h" -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QTextCodec> -#include <QtGui/QPushButton> -#include <QtGui/QScrollBar> -#include <QtGui/QVBoxLayout> +#include <QDebug> +#include <QFileInfo> +#include <QTextCodec> +#include <QPushButton> +#include <QScrollBar> +#include <QVBoxLayout> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/texteditor/codecselector.h index 74a6679b84..c654a54c62 100644 --- a/src/plugins/texteditor/codecselector.h +++ b/src/plugins/texteditor/codecselector.h @@ -33,10 +33,10 @@ #ifndef CODECSELECTOR_H #define CODECSELECTOR_H -#include <QtGui/QDialog> -#include <QtGui/QLabel> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QListWidget> +#include <QDialog> +#include <QLabel> +#include <QDialogButtonBox> +#include <QListWidget> namespace TextEditor { diff --git a/src/plugins/texteditor/codestyleeditor.cpp b/src/plugins/texteditor/codestyleeditor.cpp index 173e0f9f48..82a472c75a 100644 --- a/src/plugins/texteditor/codestyleeditor.cpp +++ b/src/plugins/texteditor/codestyleeditor.cpp @@ -41,9 +41,9 @@ #include "indenter.h" #include "snippets/snippeteditor.h" #include "snippets/isnippetprovider.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QTextBlock> -#include <QtGui/QLabel> +#include <QVBoxLayout> +#include <QTextBlock> +#include <QLabel> using namespace TextEditor; diff --git a/src/plugins/texteditor/codestylepool.cpp b/src/plugins/texteditor/codestylepool.cpp index 8e557ec1e2..bc63d99732 100644 --- a/src/plugins/texteditor/codestylepool.cpp +++ b/src/plugins/texteditor/codestylepool.cpp @@ -37,9 +37,9 @@ #include <utils/persistentsettings.h> #include <coreplugin/icore.h> -#include <QtCore/QMap> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QMap> +#include <QDir> +#include <QDebug> using namespace TextEditor; diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp index 9d0695251c..d17f5cd780 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.cpp +++ b/src/plugins/texteditor/codestyleselectorwidget.cpp @@ -37,19 +37,19 @@ #include "codestylepool.h" #include "tabsettings.h" -#include <QtGui/QComboBox> -#include <QtGui/QBoxLayout> -#include <QtGui/QCheckBox> -#include <QtGui/QPushButton> -#include <QtGui/QMenu> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QDialog> -#include <QtGui/QInputDialog> -#include <QtGui/QLabel> -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> -#include <QtCore/QTextStream> -#include <QtCore/QSignalMapper> +#include <QComboBox> +#include <QBoxLayout> +#include <QCheckBox> +#include <QPushButton> +#include <QMenu> +#include <QDialogButtonBox> +#include <QDialog> +#include <QInputDialog> +#include <QLabel> +#include <QMessageBox> +#include <QFileDialog> +#include <QTextStream> +#include <QSignalMapper> #include <QDebug> diff --git a/src/plugins/texteditor/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h index e02551c4a6..f7a6576840 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.h +++ b/src/plugins/texteditor/codestyleselectorwidget.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QHBoxLayout; diff --git a/src/plugins/texteditor/colorscheme.cpp b/src/plugins/texteditor/colorscheme.cpp index e88551b4c9..67037bb2aa 100644 --- a/src/plugins/texteditor/colorscheme.cpp +++ b/src/plugins/texteditor/colorscheme.cpp @@ -36,9 +36,9 @@ #include <utils/fileutils.h> -#include <QtCore/QFile> -#include <QtCore/QCoreApplication> -#include <QtCore/QXmlStreamWriter> +#include <QFile> +#include <QCoreApplication> +#include <QXmlStreamWriter> using namespace TextEditor; diff --git a/src/plugins/texteditor/colorscheme.h b/src/plugins/texteditor/colorscheme.h index ed3f19f98c..478da1da4a 100644 --- a/src/plugins/texteditor/colorscheme.h +++ b/src/plugins/texteditor/colorscheme.h @@ -35,9 +35,9 @@ #include "texteditor_global.h" -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtGui/QColor> +#include <QMap> +#include <QString> +#include <QColor> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/texteditor/colorschemeedit.cpp b/src/plugins/texteditor/colorschemeedit.cpp index 6ba583989d..695949fc64 100644 --- a/src/plugins/texteditor/colorschemeedit.cpp +++ b/src/plugins/texteditor/colorschemeedit.cpp @@ -35,8 +35,8 @@ #include "texteditorconstants.h" -#include <QtCore/QAbstractListModel> -#include <QtGui/QColorDialog> +#include <QAbstractListModel> +#include <QColorDialog> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/colorschemeedit.h b/src/plugins/texteditor/colorschemeedit.h index d0ec101a86..38e3958771 100644 --- a/src/plugins/texteditor/colorschemeedit.h +++ b/src/plugins/texteditor/colorschemeedit.h @@ -36,7 +36,7 @@ #include "colorscheme.h" #include "fontsettingspage.h" -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/plugins/texteditor/completionsettings.cpp b/src/plugins/texteditor/completionsettings.cpp index dbb1af7013..266cfc3a86 100644 --- a/src/plugins/texteditor/completionsettings.cpp +++ b/src/plugins/texteditor/completionsettings.cpp @@ -32,7 +32,7 @@ #include "completionsettings.h" -#include <QtCore/QSettings> +#include <QSettings> static const char groupPostfix[] = "Completion"; static const char caseSensitivityKey[] = "CaseSensitivity"; diff --git a/src/plugins/texteditor/convenience.cpp b/src/plugins/texteditor/convenience.cpp index 0e1d3ef211..3897c0823d 100644 --- a/src/plugins/texteditor/convenience.cpp +++ b/src/plugins/texteditor/convenience.cpp @@ -32,9 +32,9 @@ #include "convenience.h" -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> +#include <QTextDocument> +#include <QTextBlock> +#include <QTextCursor> namespace TextEditor { namespace Convenience { diff --git a/src/plugins/texteditor/convenience.h b/src/plugins/texteditor/convenience.h index 58cd158307..ad966118e6 100644 --- a/src/plugins/texteditor/convenience.h +++ b/src/plugins/texteditor/convenience.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/displaysettings.cpp b/src/plugins/texteditor/displaysettings.cpp index a43ea4af4c..c1d817941f 100644 --- a/src/plugins/texteditor/displaysettings.cpp +++ b/src/plugins/texteditor/displaysettings.cpp @@ -32,8 +32,8 @@ #include "displaysettings.h" -#include <QtCore/QSettings> -#include <QtCore/QString> +#include <QSettings> +#include <QString> static const char displayLineNumbersKey[] = "DisplayLineNumbers"; static const char textWrappingKey[] = "TextWrapping"; diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index fb1b30a8c0..5d69ef5bd1 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -36,8 +36,8 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> +#include <QSettings> +#include <QTextStream> using namespace TextEditor; diff --git a/src/plugins/texteditor/extraencodingsettings.cpp b/src/plugins/texteditor/extraencodingsettings.cpp index 05fb00aebd..8fdc190223 100644 --- a/src/plugins/texteditor/extraencodingsettings.cpp +++ b/src/plugins/texteditor/extraencodingsettings.cpp @@ -34,8 +34,8 @@ #include <utils/settingsutils.h> -#include <QtCore/QLatin1String> -#include <QtCore/QSettings> +#include <QLatin1String> +#include <QSettings> // Keep this for compatibility reasons. static const char kGroupPostfix[] = "EditorManager"; diff --git a/src/plugins/texteditor/extraencodingsettings.h b/src/plugins/texteditor/extraencodingsettings.h index 8a8b6e9c06..677597e8bb 100644 --- a/src/plugins/texteditor/extraencodingsettings.h +++ b/src/plugins/texteditor/extraencodingsettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariantMap> +#include <QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index 5b37796bd7..2350a1e988 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -36,7 +36,7 @@ #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QSettings> +#include <QSettings> using namespace Find; using namespace TextEditor; diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h index 670b408ddd..a4690073a6 100644 --- a/src/plugins/texteditor/findincurrentfile.h +++ b/src/plugins/texteditor/findincurrentfile.h @@ -38,7 +38,7 @@ #include <coreplugin/ifile.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtCore/QPointer> +#include <QPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 90950e2e45..2cbb05410d 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -34,14 +34,14 @@ #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QtDebug> -#include <QtCore/QSettings> -#include <QtCore/QDir> -#include <QtCore/QDirIterator> -#include <QtGui/QPushButton> -#include <QtGui/QFileDialog> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> +#include <QtDebug> +#include <QSettings> +#include <QDir> +#include <QDirIterator> +#include <QPushButton> +#include <QFileDialog> +#include <QHBoxLayout> +#include <QVBoxLayout> using namespace Find; using namespace TextEditor; diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h index 8b8bc16681..8e2471a682 100644 --- a/src/plugins/texteditor/findinfiles.h +++ b/src/plugins/texteditor/findinfiles.h @@ -37,10 +37,10 @@ #include <find/ifindfilter.h> -#include <QtCore/QPointer> -#include <QtGui/QLabel> -#include <QtGui/QComboBox> -#include <QtGui/QStringListModel> +#include <QPointer> +#include <QLabel> +#include <QComboBox> +#include <QStringListModel> namespace TextEditor { diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp index 3d746ad517..ab2250ed09 100644 --- a/src/plugins/texteditor/findinopenfiles.cpp +++ b/src/plugins/texteditor/findinopenfiles.cpp @@ -37,7 +37,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/openeditorsmodel.h> -#include <QtCore/QSettings> +#include <QSettings> using namespace Find; using namespace TextEditor; diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp index 3a05dd233b..c94f6ba168 100644 --- a/src/plugins/texteditor/fontsettings.cpp +++ b/src/plugins/texteditor/fontsettings.cpp @@ -36,13 +36,13 @@ #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> -#include <QtGui/QTextCharFormat> -#include <QtGui/QFont> -#include <QtGui/QMainWindow> +#include <QFile> +#include <QFileInfo> +#include <QSettings> +#include <QCoreApplication> +#include <QTextCharFormat> +#include <QFont> +#include <QMainWindow> static const char fontFamilyKey[] = "FontFamily"; static const char fontSizeKey[] = "FontSize"; diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h index 41a12b7067..2e811480b9 100644 --- a/src/plugins/texteditor/fontsettings.h +++ b/src/plugins/texteditor/fontsettings.h @@ -37,9 +37,9 @@ #include "colorscheme.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QVector> +#include <QString> +#include <QList> +#include <QVector> QT_BEGIN_NAMESPACE class QTextCharFormat; diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index fe6f4066dc..ab018599f2 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -41,21 +41,21 @@ #include <utils/stringutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QTimer> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QFileDialog> -#include <QtGui/QFontDatabase> -#include <QtGui/QInputDialog> -#include <QtGui/QListWidget> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QPalette> -#include <QtGui/QTextCharFormat> -#include <QtGui/QTextEdit> -#include <QtGui/QToolButton> +#include <QDebug> +#include <QSettings> +#include <QTimer> +#include <QCheckBox> +#include <QComboBox> +#include <QFileDialog> +#include <QFontDatabase> +#include <QInputDialog> +#include <QListWidget> +#include <QMessageBox> +#include <QMainWindow> +#include <QPalette> +#include <QTextCharFormat> +#include <QTextEdit> +#include <QToolButton> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index bbba17bb18..e84710cf28 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/src/plugins/texteditor/fontsettingspage.h @@ -39,8 +39,8 @@ #include "texteditoroptionspage.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/texteditor/generichighlighter/context.h b/src/plugins/texteditor/generichighlighter/context.h index b0ddd4b130..3d5a082354 100644 --- a/src/plugins/texteditor/generichighlighter/context.h +++ b/src/plugins/texteditor/generichighlighter/context.h @@ -35,9 +35,9 @@ #include "includerulesinstruction.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QList> +#include <QSharedPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp index f2ece94de1..e5b3bb8da2 100644 --- a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp +++ b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp @@ -34,12 +34,12 @@ #include <utils/fileutils.h> -#include <QtCore/QLatin1Char> -#include <QtCore/QEventLoop> -#include <QtCore/QFile> -#include <QtCore/QScopedPointer> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QNetworkReply> +#include <QLatin1Char> +#include <QEventLoop> +#include <QFile> +#include <QScopedPointer> +#include <QNetworkRequest> +#include <QNetworkReply> #include <utils/networkaccessmanager.h> diff --git a/src/plugins/texteditor/generichighlighter/definitiondownloader.h b/src/plugins/texteditor/generichighlighter/definitiondownloader.h index 59056eee10..d387bfb113 100644 --- a/src/plugins/texteditor/generichighlighter/definitiondownloader.h +++ b/src/plugins/texteditor/generichighlighter/definitiondownloader.h @@ -33,9 +33,9 @@ #ifndef DEFINITIONDOWNLOADER_H #define DEFINITIONDOWNLOADER_H -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QUrl> +#include <QObject> +#include <QString> +#include <QUrl> QT_BEGIN_NAMESPACE class QNetworkReply; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp index c8c01d8e52..043e2c0eed 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp @@ -37,7 +37,7 @@ #include "itemdata.h" #include "reuse.h" -#include <QtCore/QString> +#include <QString> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinition.h b/src/plugins/texteditor/generichighlighter/highlightdefinition.h index 9d671d8c1e..029eaa7e5b 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinition.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinition.h @@ -33,10 +33,10 @@ #ifndef HIGHLIGHTDEFINITION_H #define HIGHLIGHTDEFINITION_H -#include <QtCore/QString> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QHash> +#include <QSet> +#include <QSharedPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp index da38842a7a..cc123bcf20 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp @@ -40,7 +40,7 @@ #include "manager.h" #include "highlighterexception.h" -#include <QtCore/QLatin1String> +#include <QLatin1String> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h index 2369be3022..fa771cf0e6 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h @@ -33,12 +33,12 @@ #ifndef HIGHLIGHTDEFINITIONHANDLER_H #define HIGHLIGHTDEFINITIONHANDLER_H -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> -#include <QtCore/QStack> +#include <QString> +#include <QList> +#include <QSharedPointer> +#include <QStack> -#include <QtXml/QXmlDefaultHandler> +#include <QXmlDefaultHandler> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h index bde7a9e5dc..055dc6eb01 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h @@ -33,10 +33,10 @@ #ifndef HIGHLIGHTDEFINITIONMETADATA_H #define HIGHLIGHTDEFINITIONMETADATA_H -#include <QtCore/QString> -#include <QtCore/QLatin1String> -#include <QtCore/QStringList> -#include <QtCore/QUrl> +#include <QString> +#include <QLatin1String> +#include <QStringList> +#include <QUrl> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp index d8ad3ea29c..155948f183 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.cpp +++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp @@ -40,8 +40,8 @@ #include "reuse.h" #include "tabsettings.h" -#include <QtCore/QLatin1String> -#include <QtCore/QLatin1Char> +#include <QLatin1String> +#include <QLatin1Char> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h index 4d80f5d5b4..e4e3299e5f 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.h +++ b/src/plugins/texteditor/generichighlighter/highlighter.h @@ -36,14 +36,14 @@ #include "basetextdocumentlayout.h" #include "syntaxhighlighter.h" -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtCore/QStack> -#include <QtCore/QSharedPointer> -#include <QtCore/QStringList> - -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextCharFormat> +#include <QString> +#include <QVector> +#include <QStack> +#include <QSharedPointer> +#include <QStringList> + +#include <QSyntaxHighlighter> +#include <QTextCharFormat> namespace TextEditor { diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp index 7dc71e6676..d656ab424a 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp @@ -34,14 +34,14 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QLatin1String> -#include <QtCore/QLatin1Char> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QStringList> +#include <QSettings> +#include <QLatin1String> +#include <QLatin1Char> +#include <QDir> +#include <QFile> +#include <QStringList> #ifdef Q_OS_UNIX -#include <QtCore/QProcess> +#include <QProcess> #endif namespace TextEditor { diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.h b/src/plugins/texteditor/generichighlighter/highlightersettings.h index fef2de2a7b..9bc3c1229a 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettings.h +++ b/src/plugins/texteditor/generichighlighter/highlightersettings.h @@ -33,10 +33,10 @@ #ifndef HIGHLIGHTERSETTINGS_H #define HIGHLIGHTERSETTINGS_H -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QList> -#include <QtCore/QRegExp> +#include <QString> +#include <QStringList> +#include <QList> +#include <QRegExp> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp index 8f9baf8cb7..71f654da7f 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp @@ -39,7 +39,7 @@ #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> -#include <QtGui/QMessageBox> +#include <QMessageBox> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/includerulesinstruction.h b/src/plugins/texteditor/generichighlighter/includerulesinstruction.h index 995e0e000c..e094b35974 100644 --- a/src/plugins/texteditor/generichighlighter/includerulesinstruction.h +++ b/src/plugins/texteditor/generichighlighter/includerulesinstruction.h @@ -33,7 +33,7 @@ #ifndef INCLUDERULESINSTRUCTION_H #define INCLUDERULESINSTRUCTION_H -#include <QtCore/QString> +#include <QString> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/itemdata.h b/src/plugins/texteditor/generichighlighter/itemdata.h index 6e8ada0836..a7f1beab16 100644 --- a/src/plugins/texteditor/generichighlighter/itemdata.h +++ b/src/plugins/texteditor/generichighlighter/itemdata.h @@ -33,8 +33,8 @@ #ifndef ITEMDATA_H #define ITEMDATA_H -#include <QtCore/QString> -#include <QtGui/QColor> +#include <QString> +#include <QColor> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/keywordlist.h b/src/plugins/texteditor/generichighlighter/keywordlist.h index f841debfbf..f7c146992f 100644 --- a/src/plugins/texteditor/generichighlighter/keywordlist.h +++ b/src/plugins/texteditor/generichighlighter/keywordlist.h @@ -33,8 +33,8 @@ #ifndef KEYWORDLIST_H #define KEYWORDLIST_H -#include <QtCore/QString> -#include <QtCore/QSet> +#include <QString> +#include <QSet> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp index 401ccffadc..87226c2036 100644 --- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp +++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp @@ -33,18 +33,18 @@ #include "managedefinitionsdialog.h" #include "manager.h" -#include <QtCore/QUrl> -#include <QtCore/QIODevice> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QFuture> -#include <QtCore/QFutureWatcher> -#include <QtCore/QtConcurrentMap> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> - -#include <QtCore/QDebug> +#include <QUrl> +#include <QIODevice> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QFuture> +#include <QFutureWatcher> +#include <QtConcurrentMap> +#include <QFile> +#include <QFileInfo> +#include <QMessageBox> + +#include <QDebug> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h index f6710273e8..67f25d86b9 100644 --- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h +++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h @@ -36,7 +36,7 @@ #include "ui_managedefinitionsdialog.h" #include "highlightdefinitionmetadata.h" -#include <QtCore/QList> +#include <QList> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp index 920461807d..fe6eed4b85 100644 --- a/src/plugins/texteditor/generichighlighter/manager.cpp +++ b/src/plugins/texteditor/generichighlighter/manager.cpp @@ -46,29 +46,29 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <utils/QtConcurrentTools> -#include <QtCore/QtAlgorithms> -#include <QtCore/QtPlugin> -#include <QtCore/QString> -#include <QtCore/QLatin1Char> -#include <QtCore/QLatin1String> -#include <QtCore/QStringList> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QRegExp> -#include <QtCore/QFuture> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QtConcurrentMap> -#include <QtCore/QUrl> -#include <QtCore/QSet> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtGui/QDesktopServices> -#include <QtGui/QMessageBox> -#include <QtXml/QXmlSimpleReader> -#include <QtXml/QXmlInputSource> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QNetworkReply> +#include <QtAlgorithms> +#include <QtPlugin> +#include <QString> +#include <QLatin1Char> +#include <QLatin1String> +#include <QStringList> +#include <QFile> +#include <QFileInfo> +#include <QDir> +#include <QRegExp> +#include <QFuture> +#include <QtConcurrentRun> +#include <QtConcurrentMap> +#include <QUrl> +#include <QSet> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QDesktopServices> +#include <QMessageBox> +#include <QXmlSimpleReader> +#include <QXmlInputSource> +#include <QNetworkRequest> +#include <QNetworkReply> #include <QtAlgorithms> using namespace TextEditor; diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h index 214a0e142e..b5a84de2e9 100644 --- a/src/plugins/texteditor/generichighlighter/manager.h +++ b/src/plugins/texteditor/generichighlighter/manager.h @@ -37,14 +37,14 @@ #include <coreplugin/mimedatabase.h> -#include <QtCore/QString> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QUrl> -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QSharedPointer> -#include <QtCore/QFutureWatcher> +#include <QString> +#include <QHash> +#include <QSet> +#include <QUrl> +#include <QList> +#include <QPair> +#include <QSharedPointer> +#include <QFutureWatcher> #include <utils/networkaccessmanager.h> diff --git a/src/plugins/texteditor/generichighlighter/progressdata.cpp b/src/plugins/texteditor/generichighlighter/progressdata.cpp index db0bd46b9a..594678ff38 100644 --- a/src/plugins/texteditor/generichighlighter/progressdata.cpp +++ b/src/plugins/texteditor/generichighlighter/progressdata.cpp @@ -33,7 +33,7 @@ #include "progressdata.h" #include "rule.h" -#include <QtCore/QtGlobal> +#include <QtGlobal> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/progressdata.h b/src/plugins/texteditor/generichighlighter/progressdata.h index eae964b332..7ba53a6c6b 100644 --- a/src/plugins/texteditor/generichighlighter/progressdata.h +++ b/src/plugins/texteditor/generichighlighter/progressdata.h @@ -33,7 +33,7 @@ #ifndef PROGRESSDATA_H #define PROGRESSDATA_H -#include <QtCore/QStringList> +#include <QStringList> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/reuse.h b/src/plugins/texteditor/generichighlighter/reuse.h index 344831b950..21775ada5c 100644 --- a/src/plugins/texteditor/generichighlighter/reuse.h +++ b/src/plugins/texteditor/generichighlighter/reuse.h @@ -34,10 +34,10 @@ #define REUSE_H #include <Qt> -#include <QtCore/QString> -#include <QtCore/QLatin1String> -#include <QtCore/QChar> -#include <QtGui/QFont> +#include <QString> +#include <QLatin1String> +#include <QChar> +#include <QFont> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/rule.cpp b/src/plugins/texteditor/generichighlighter/rule.cpp index 505358a0f3..7fa1eb5caa 100644 --- a/src/plugins/texteditor/generichighlighter/rule.cpp +++ b/src/plugins/texteditor/generichighlighter/rule.cpp @@ -36,7 +36,7 @@ #include "highlightdefinition.h" #include "reuse.h" -#include <QtCore/QStringList> +#include <QStringList> #include <functional> diff --git a/src/plugins/texteditor/generichighlighter/rule.h b/src/plugins/texteditor/generichighlighter/rule.h index f8afd921e0..b5e7bc5e33 100644 --- a/src/plugins/texteditor/generichighlighter/rule.h +++ b/src/plugins/texteditor/generichighlighter/rule.h @@ -33,9 +33,9 @@ #ifndef RULE_H #define RULE_H -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QList> +#include <QSharedPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/specificrules.cpp b/src/plugins/texteditor/generichighlighter/specificrules.cpp index 7cd53139ba..500dff2c0b 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.cpp +++ b/src/plugins/texteditor/generichighlighter/specificrules.cpp @@ -36,7 +36,7 @@ #include "progressdata.h" #include "reuse.h" -#include <QtCore/QLatin1Char> +#include <QLatin1Char> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/specificrules.h b/src/plugins/texteditor/generichighlighter/specificrules.h index 582bdf1321..392f8ed9df 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.h +++ b/src/plugins/texteditor/generichighlighter/specificrules.h @@ -36,10 +36,10 @@ #include "rule.h" #include "dynamicrule.h" -#include <QtCore/QChar> -#include <QtCore/QStringList> -#include <QtCore/QRegExp> -#include <QtCore/QSharedPointer> +#include <QChar> +#include <QStringList> +#include <QRegExp> +#include <QSharedPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/helpitem.cpp b/src/plugins/texteditor/helpitem.cpp index b68d888e01..65a724fe13 100644 --- a/src/plugins/texteditor/helpitem.cpp +++ b/src/plugins/texteditor/helpitem.cpp @@ -35,9 +35,9 @@ #include <coreplugin/helpmanager.h> #include <utils/htmldocextractor.h> -#include <QtCore/QUrl> -#include <QtCore/QByteArray> -#include <QtCore/QMap> +#include <QUrl> +#include <QByteArray> +#include <QMap> using namespace TextEditor; diff --git a/src/plugins/texteditor/helpitem.h b/src/plugins/texteditor/helpitem.h index 250b370718..bceed678a7 100644 --- a/src/plugins/texteditor/helpitem.h +++ b/src/plugins/texteditor/helpitem.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QString> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/icodestylepreferences.cpp b/src/plugins/texteditor/icodestylepreferences.cpp index 998baa9a3a..8f0f444214 100644 --- a/src/plugins/texteditor/icodestylepreferences.cpp +++ b/src/plugins/texteditor/icodestylepreferences.cpp @@ -37,8 +37,8 @@ #include <utils/settingsutils.h> -#include <QtCore/QSettings> -#include <QtCore/QStringList> +#include <QSettings> +#include <QStringList> using namespace TextEditor; diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h index 8800644f09..560d02da05 100644 --- a/src/plugins/texteditor/icodestylepreferences.h +++ b/src/plugins/texteditor/icodestylepreferences.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtCore/QObject> -#include <QtCore/QVariant> +#include <QObject> +#include <QVariant> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/icodestylepreferencesfactory.h b/src/plugins/texteditor/icodestylepreferencesfactory.h index 22fd121d40..ade10ea734 100644 --- a/src/plugins/texteditor/icodestylepreferencesfactory.h +++ b/src/plugins/texteditor/icodestylepreferencesfactory.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QObject> +#include <QObject> namespace TextEditor { diff --git a/src/plugins/texteditor/indenter.cpp b/src/plugins/texteditor/indenter.cpp index be1fa6511d..eea6d1ac23 100644 --- a/src/plugins/texteditor/indenter.cpp +++ b/src/plugins/texteditor/indenter.cpp @@ -33,8 +33,8 @@ #include "indenter.h" #include "tabsettings.h" -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> +#include <QTextDocument> +#include <QTextCursor> using namespace TextEditor; diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h index 17db4724f4..fbe64213ad 100644 --- a/src/plugins/texteditor/indenter.h +++ b/src/plugins/texteditor/indenter.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/ioutlinewidget.h b/src/plugins/texteditor/ioutlinewidget.h index 2d07e9171a..61a3926e83 100644 --- a/src/plugins/texteditor/ioutlinewidget.h +++ b/src/plugins/texteditor/ioutlinewidget.h @@ -34,7 +34,7 @@ #define IOUTLINEWIDGET_H #include <texteditor/texteditor_global.h> -#include <QtGui/QWidget> +#include <QWidget> namespace Core { class IEditor; diff --git a/src/plugins/texteditor/itexteditor.cpp b/src/plugins/texteditor/itexteditor.cpp index 1ae99b00b7..7868ab7c44 100644 --- a/src/plugins/texteditor/itexteditor.cpp +++ b/src/plugins/texteditor/itexteditor.cpp @@ -34,7 +34,7 @@ #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QTextCodec> +#include <QTextCodec> using namespace TextEditor; diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h index c72c8f95ea..f53dde85b8 100644 --- a/src/plugins/texteditor/itexteditor.h +++ b/src/plugins/texteditor/itexteditor.h @@ -37,10 +37,10 @@ #include <coreplugin/editormanager/ieditor.h> -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtGui/QIcon> +#include <QObject> +#include <QList> +#include <QMap> +#include <QIcon> QT_BEGIN_NAMESPACE class QIcon; diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp index 4ec8eacd5b..24a760933b 100644 --- a/src/plugins/texteditor/linenumberfilter.cpp +++ b/src/plugins/texteditor/linenumberfilter.cpp @@ -37,7 +37,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/modemanager.h> -#include <QtCore/QVariant> +#include <QVariant> using namespace Core; using namespace Locator; diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index d448266477..0a20b6d01e 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -35,9 +35,9 @@ #include <locator/ilocatorfilter.h> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QFutureInterface> +#include <QString> +#include <QList> +#include <QFutureInterface> namespace TextEditor { diff --git a/src/plugins/texteditor/normalindenter.cpp b/src/plugins/texteditor/normalindenter.cpp index 981dd4ec43..7372017856 100644 --- a/src/plugins/texteditor/normalindenter.cpp +++ b/src/plugins/texteditor/normalindenter.cpp @@ -33,7 +33,7 @@ #include "normalindenter.h" #include "tabsettings.h" -#include <QtGui/QTextDocument> +#include <QTextDocument> using namespace TextEditor; diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index 1af5354e0c..3c9e2981e8 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -36,12 +36,12 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QToolButton> -#include <QtGui/QLabel> -#include <QtGui/QStackedWidget> +#include <QVBoxLayout> +#include <QToolButton> +#include <QLabel> +#include <QStackedWidget> -#include <QtCore/QDebug> +#include <QDebug> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/outlinefactory.h b/src/plugins/texteditor/outlinefactory.h index c10608a23e..87ba4211fe 100644 --- a/src/plugins/texteditor/outlinefactory.h +++ b/src/plugins/texteditor/outlinefactory.h @@ -35,8 +35,8 @@ #include <texteditor/ioutlinewidget.h> #include <coreplugin/inavigationwidgetfactory.h> -#include <QtGui/QStackedWidget> -#include <QtGui/QMenu> +#include <QStackedWidget> +#include <QMenu> namespace Core { class IEditor; diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index c0bb9f64c1..4f06f71561 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -49,10 +49,10 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> -#include <QtCore/QSharedPointer> -#include <QtCore/QFileInfo> +#include <QSharedPointer> +#include <QFileInfo> -#include <QtCore/QDebug> +#include <QDebug> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp index 18d7f0b68e..7d35c352d7 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.cpp +++ b/src/plugins/texteditor/plaintexteditorfactory.cpp @@ -44,7 +44,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/infobar.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/plaintexteditorfactory.h b/src/plugins/texteditor/plaintexteditorfactory.h index 64aa516867..14ca8632ec 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.h +++ b/src/plugins/texteditor/plaintexteditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace TextEditor { class TextEditorActionHandler; diff --git a/src/plugins/texteditor/quickfix.h b/src/plugins/texteditor/quickfix.h index 4e588c7fc5..bbc1269a63 100644 --- a/src/plugins/texteditor/quickfix.h +++ b/src/plugins/texteditor/quickfix.h @@ -35,9 +35,9 @@ #include "texteditor_global.h" -#include <QtCore/QString> -#include <QtCore/QMetaType> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QMetaType> +#include <QSharedPointer> namespace TextEditor { diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index 25433d8ae9..5d665fb4dc 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -39,13 +39,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QFile> -#include <QtCore/QSet> -#include <QtGui/QMainWindow> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> -#include <QtCore/QDebug> +#include <QFile> +#include <QSet> +#include <QMainWindow> +#include <QTextBlock> +#include <QTextCursor> +#include <QTextDocument> +#include <QDebug> using namespace TextEditor; diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h index c12ff7ae76..ecf4c2d875 100644 --- a/src/plugins/texteditor/refactoringchanges.h +++ b/src/plugins/texteditor/refactoringchanges.h @@ -37,10 +37,10 @@ #include <utils/textfileformat.h> #include <texteditor/texteditor_global.h> -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QSharedPointer> -#include <QtCore/QPair> +#include <QList> +#include <QString> +#include <QSharedPointer> +#include <QPair> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp index 57a85f7541..bf21cd9f85 100644 --- a/src/plugins/texteditor/refactoroverlay.cpp +++ b/src/plugins/texteditor/refactoroverlay.cpp @@ -34,10 +34,10 @@ #include "basetextdocumentlayout.h" #include "basetexteditor.h" -#include <QtGui/QPainter> -#include <QtGui/QTextBlock> +#include <QPainter> +#include <QTextBlock> -#include <QtCore/QDebug> +#include <QDebug> namespace TextEditor { diff --git a/src/plugins/texteditor/refactoroverlay.h b/src/plugins/texteditor/refactoroverlay.h index 52cc17ec6c..ac72919427 100644 --- a/src/plugins/texteditor/refactoroverlay.h +++ b/src/plugins/texteditor/refactoroverlay.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtGui/QTextCursor> -#include <QtGui/QIcon> +#include <QTextCursor> +#include <QIcon> namespace TextEditor { class BaseTextEditorWidget; diff --git a/src/plugins/texteditor/semantichighlighter.cpp b/src/plugins/texteditor/semantichighlighter.cpp index 54497f8766..ddf0c002cb 100644 --- a/src/plugins/texteditor/semantichighlighter.cpp +++ b/src/plugins/texteditor/semantichighlighter.cpp @@ -36,8 +36,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> +#include <QTextDocument> +#include <QTextBlock> using namespace TextEditor; using namespace TextEditor::SemanticHighlighter; diff --git a/src/plugins/texteditor/semantichighlighter.h b/src/plugins/texteditor/semantichighlighter.h index 987dc72902..62e80e27cc 100644 --- a/src/plugins/texteditor/semantichighlighter.h +++ b/src/plugins/texteditor/semantichighlighter.h @@ -35,11 +35,11 @@ #include "texteditor_global.h" -#include <QtCore/QHash> -#include <QtCore/QMap> -#include <QtCore/QVector> -#include <QtCore/QFuture> -#include <QtGui/QTextCharFormat> +#include <QHash> +#include <QMap> +#include <QVector> +#include <QFuture> +#include <QTextCharFormat> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/simplecodestylepreferenceswidget.cpp b/src/plugins/texteditor/simplecodestylepreferenceswidget.cpp index bc726b4b11..80c99a60cb 100644 --- a/src/plugins/texteditor/simplecodestylepreferenceswidget.cpp +++ b/src/plugins/texteditor/simplecodestylepreferenceswidget.cpp @@ -35,7 +35,7 @@ #include "tabsettings.h" #include "tabsettingswidget.h" -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> namespace TextEditor { diff --git a/src/plugins/texteditor/simplecodestylepreferenceswidget.h b/src/plugins/texteditor/simplecodestylepreferenceswidget.h index e650f41e7c..f562dfd653 100644 --- a/src/plugins/texteditor/simplecodestylepreferenceswidget.h +++ b/src/plugins/texteditor/simplecodestylepreferenceswidget.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace TextEditor { diff --git a/src/plugins/texteditor/snippets/isnippetprovider.h b/src/plugins/texteditor/snippets/isnippetprovider.h index 1e5921848c..e89a0cc386 100644 --- a/src/plugins/texteditor/snippets/isnippetprovider.h +++ b/src/plugins/texteditor/snippets/isnippetprovider.h @@ -35,7 +35,7 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QObject> +#include <QObject> namespace TextEditor { diff --git a/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp b/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp index 5dfbd7d365..ced0540138 100644 --- a/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp +++ b/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp @@ -34,8 +34,8 @@ #include <texteditor/texteditorconstants.h> -#include <QtCore/QLatin1String> -#include <QtCore/QCoreApplication> +#include <QLatin1String> +#include <QCoreApplication> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/snippets/reuse.h b/src/plugins/texteditor/snippets/reuse.h index 17e7ec5288..7c1ee80812 100644 --- a/src/plugins/texteditor/snippets/reuse.h +++ b/src/plugins/texteditor/snippets/reuse.h @@ -33,8 +33,8 @@ #ifndef REUSE_H #define REUSE_H -#include <QtCore/QString> -#include <QtCore/QLatin1String> +#include <QString> +#include <QLatin1String> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp index fc35fd29f1..5be07d5e78 100644 --- a/src/plugins/texteditor/snippets/snippet.cpp +++ b/src/plugins/texteditor/snippets/snippet.cpp @@ -32,9 +32,9 @@ #include "snippet.h" -#include <QtCore/QLatin1Char> -#include <QtCore/QLatin1String> -#include <QtGui/QTextDocument> +#include <QLatin1Char> +#include <QLatin1String> +#include <QTextDocument> using namespace TextEditor; diff --git a/src/plugins/texteditor/snippets/snippet.h b/src/plugins/texteditor/snippets/snippet.h index fa41228fde..8485f5e8e7 100644 --- a/src/plugins/texteditor/snippets/snippet.h +++ b/src/plugins/texteditor/snippets/snippet.h @@ -35,8 +35,8 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QChar> -#include <QtCore/QString> +#include <QChar> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/snippets/snippetassistcollector.h b/src/plugins/texteditor/snippets/snippetassistcollector.h index d0f4a18f12..a1045d6a59 100644 --- a/src/plugins/texteditor/snippets/snippetassistcollector.h +++ b/src/plugins/texteditor/snippets/snippetassistcollector.h @@ -35,9 +35,9 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtGui/QIcon> +#include <QString> +#include <QList> +#include <QIcon> namespace TextEditor { diff --git a/src/plugins/texteditor/snippets/snippeteditor.cpp b/src/plugins/texteditor/snippets/snippeteditor.cpp index 3aa654939e..38c420c9e2 100644 --- a/src/plugins/texteditor/snippets/snippeteditor.cpp +++ b/src/plugins/texteditor/snippets/snippeteditor.cpp @@ -36,8 +36,8 @@ #include <texteditor/texteditorconstants.h> #include <texteditor/normalindenter.h> -#include <QtGui/QTextDocument> -#include <QtGui/QFocusEvent> +#include <QTextDocument> +#include <QFocusEvent> using namespace TextEditor; diff --git a/src/plugins/texteditor/snippets/snippetscollection.cpp b/src/plugins/texteditor/snippets/snippetscollection.cpp index c78682b76a..bd31c1ced8 100644 --- a/src/plugins/texteditor/snippets/snippetscollection.cpp +++ b/src/plugins/texteditor/snippets/snippetscollection.cpp @@ -38,12 +38,12 @@ #include <extensionsystem/pluginmanager.h> #include <utils/fileutils.h> -#include <QtCore/QLatin1String> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QXmlStreamReader> +#include <QLatin1String> +#include <QFile> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QXmlStreamReader> #include <QtAlgorithms> #include <iterator> diff --git a/src/plugins/texteditor/snippets/snippetscollection.h b/src/plugins/texteditor/snippets/snippetscollection.h index 1b5712b40e..cc89ab5126 100644 --- a/src/plugins/texteditor/snippets/snippetscollection.h +++ b/src/plugins/texteditor/snippets/snippetscollection.h @@ -35,10 +35,10 @@ #include "snippet.h" -#include <QtCore/QVector> -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QXmlStreamWriter> +#include <QVector> +#include <QStringList> +#include <QHash> +#include <QXmlStreamWriter> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/snippets/snippetssettings.cpp b/src/plugins/texteditor/snippets/snippetssettings.cpp index f41ab686c8..2a998d3dfe 100644 --- a/src/plugins/texteditor/snippets/snippetssettings.cpp +++ b/src/plugins/texteditor/snippets/snippetssettings.cpp @@ -33,7 +33,7 @@ #include "snippetssettings.h" #include "reuse.h" -#include <QtCore/QSettings> +#include <QSettings> namespace { diff --git a/src/plugins/texteditor/snippets/snippetssettings.h b/src/plugins/texteditor/snippets/snippetssettings.h index 55dfefd580..32d8138781 100644 --- a/src/plugins/texteditor/snippets/snippetssettings.h +++ b/src/plugins/texteditor/snippets/snippetssettings.h @@ -33,7 +33,7 @@ #ifndef SNIPPETSSETTINGS_H #define SNIPPETSSETTINGS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp index 9902733c06..6e719a4ea5 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp +++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp @@ -44,14 +44,14 @@ #include <texteditor/fontsettings.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QModelIndex> -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtCore/QHash> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QModelIndex> +#include <QAbstractTableModel> +#include <QList> +#include <QSettings> +#include <QTextStream> +#include <QHash> +#include <QMessageBox> +#include <QMainWindow> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/storagesettings.cpp b/src/plugins/texteditor/storagesettings.cpp index a4be90cbc1..75e6165a6c 100644 --- a/src/plugins/texteditor/storagesettings.cpp +++ b/src/plugins/texteditor/storagesettings.cpp @@ -34,8 +34,8 @@ #include <utils/settingsutils.h> -#include <QtCore/QSettings> -#include <QtCore/QString> +#include <QSettings> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h index c2e7fd2ef3..85a3e579d5 100644 --- a/src/plugins/texteditor/storagesettings.h +++ b/src/plugins/texteditor/storagesettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariantMap> +#include <QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h index 557c4f9417..3ab0860cbc 100644 --- a/src/plugins/texteditor/syntaxhighlighter.h +++ b/src/plugins/texteditor/syntaxhighlighter.h @@ -34,8 +34,8 @@ #include "texteditor_global.h" -#include <QtCore/QObject> -#include <QtGui/QTextLayout> +#include <QObject> +#include <QTextLayout> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/tabsettings.cpp b/src/plugins/texteditor/tabsettings.cpp index 8a9efb06e8..e3f82bd5f0 100644 --- a/src/plugins/texteditor/tabsettings.cpp +++ b/src/plugins/texteditor/tabsettings.cpp @@ -34,11 +34,11 @@ #include <utils/settingsutils.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QString> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> +#include <QDebug> +#include <QSettings> +#include <QString> +#include <QTextCursor> +#include <QTextDocument> static const char spacesForTabsKey[] = "SpacesForTabs"; static const char autoSpacesForTabsKey[] = "AutoSpacesForTabs"; diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h index a22c50bfa9..d12af6804e 100644 --- a/src/plugins/texteditor/tabsettings.h +++ b/src/plugins/texteditor/tabsettings.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtCore/QVariant> -#include <QtGui/QTextBlock> +#include <QVariant> +#include <QTextBlock> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/tabsettingswidget.cpp b/src/plugins/texteditor/tabsettingswidget.cpp index 0033465062..c88e136818 100644 --- a/src/plugins/texteditor/tabsettingswidget.cpp +++ b/src/plugins/texteditor/tabsettingswidget.cpp @@ -34,7 +34,7 @@ #include "ui_tabsettingswidget.h" #include "tabsettings.h" -#include <QtCore/QTextStream> +#include <QTextStream> namespace TextEditor { diff --git a/src/plugins/texteditor/tabsettingswidget.h b/src/plugins/texteditor/tabsettingswidget.h index 46fe8d4ba5..d2eaaecd45 100644 --- a/src/plugins/texteditor/tabsettingswidget.h +++ b/src/plugins/texteditor/tabsettingswidget.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace TextEditor { diff --git a/src/plugins/texteditor/texteditor_global.h b/src/plugins/texteditor/texteditor_global.h index 607f71cccd..b7950b8b2b 100644 --- a/src/plugins/texteditor/texteditor_global.h +++ b/src/plugins/texteditor/texteditor_global.h @@ -33,7 +33,7 @@ #ifndef TEXTEDITOR_GLOBAL_H #define TEXTEDITOR_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(TEXTEDITOR_LIBRARY) # define TEXTEDITOR_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 17d180c2c0..0e20f1901f 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -48,10 +48,10 @@ #include <coreplugin/id.h> #include <utils/qtcassert.h> -#include <QtCore/QSet> -#include <QtCore/QtDebug> -#include <QtGui/QAction> -#include <QtGui/QTextCursor> +#include <QSet> +#include <QtDebug> +#include <QAction> +#include <QTextCursor> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h index 70ff79237a..f94b384267 100644 --- a/src/plugins/texteditor/texteditoractionhandler.h +++ b/src/plugins/texteditor/texteditoractionhandler.h @@ -38,9 +38,9 @@ #include <coreplugin/icontext.h> #include <coreplugin/id.h> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QList> +#include <QObject> +#include <QPointer> +#include <QList> QT_FORWARD_DECLARE_CLASS(QAction) diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h index 0f26a6f783..86108f84a5 100644 --- a/src/plugins/texteditor/texteditorconstants.h +++ b/src/plugins/texteditor/texteditorconstants.h @@ -33,7 +33,7 @@ #ifndef TEXTEDITORCONSTANTS_H #define TEXTEDITORCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace TextEditor { namespace Constants { diff --git a/src/plugins/texteditor/texteditoroptionspage.cpp b/src/plugins/texteditor/texteditoroptionspage.cpp index 7b39b36df4..cce4908b12 100644 --- a/src/plugins/texteditor/texteditoroptionspage.cpp +++ b/src/plugins/texteditor/texteditoroptionspage.cpp @@ -34,8 +34,8 @@ #include "texteditorconstants.h" -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> using namespace TextEditor; diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp index 0fd564f6bd..8833dd4b32 100644 --- a/src/plugins/texteditor/texteditoroverlay.cpp +++ b/src/plugins/texteditor/texteditoroverlay.cpp @@ -33,10 +33,10 @@ #include "texteditoroverlay.h" #include "basetexteditor.h" -#include <QtCore/QDebug> -#include <QtCore/QMap> -#include <QtGui/QPainter> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QMap> +#include <QPainter> +#include <QTextBlock> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/texteditoroverlay.h b/src/plugins/texteditor/texteditoroverlay.h index 7dd8c1ddc9..c4a4d9904b 100644 --- a/src/plugins/texteditor/texteditoroverlay.h +++ b/src/plugins/texteditor/texteditoroverlay.h @@ -33,11 +33,11 @@ #ifndef TEXTEDITOROVERLAY_H #define TEXTEDITOROVERLAY_H -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QVector> -#include <QtGui/QTextCursor> -#include <QtGui/QColor> +#include <QObject> +#include <QList> +#include <QVector> +#include <QTextCursor> +#include <QColor> QT_FORWARD_DECLARE_CLASS(QWidget) diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index fd915e80b0..d10a75d65f 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -62,9 +62,9 @@ #include <find/searchresultwindow.h> #include <utils/qtcassert.h> -#include <QtCore/QtPlugin> -#include <QtGui/QMainWindow> -#include <QtGui/QShortcut> +#include <QtPlugin> +#include <QMainWindow> +#include <QShortcut> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index bc4d9cd475..717a3f267e 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -54,7 +54,7 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtGui/QApplication> +#include <QApplication> using namespace TextEditor; using namespace TextEditor::Constants; diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h index e8915838d4..b0ba7be733 100644 --- a/src/plugins/texteditor/texteditorsettings.h +++ b/src/plugins/texteditor/texteditorsettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE template <class Key, class T> diff --git a/src/plugins/texteditor/textfilewizard.cpp b/src/plugins/texteditor/textfilewizard.cpp index 88d6aba2f9..12d7b91d1b 100644 --- a/src/plugins/texteditor/textfilewizard.cpp +++ b/src/plugins/texteditor/textfilewizard.cpp @@ -33,7 +33,7 @@ #include "textfilewizard.h" #include "basetexteditor.h" #include "texteditorconstants.h" -#include <QtCore/QDebug> +#include <QDebug> using namespace TextEditor; diff --git a/src/plugins/texteditor/tooltip/effects.h b/src/plugins/texteditor/tooltip/effects.h index f5083a646d..300aceb5e7 100644 --- a/src/plugins/texteditor/tooltip/effects.h +++ b/src/plugins/texteditor/tooltip/effects.h @@ -33,7 +33,7 @@ #ifndef EFFECTS_H #define EFFECTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> // This is a copy of a Qt private header. Please read comments in tooltip.h. diff --git a/src/plugins/texteditor/tooltip/reuse.h b/src/plugins/texteditor/tooltip/reuse.h index 7c590f2c50..b19a77f4ca 100644 --- a/src/plugins/texteditor/tooltip/reuse.h +++ b/src/plugins/texteditor/tooltip/reuse.h @@ -33,11 +33,11 @@ #ifndef TOOLTIPREUSE_H #define TOOLTIPREUSE_H -#include <QtCore/QPoint> -#include <QtCore/QRect> -#include <QtGui/QWidget> -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> +#include <QPoint> +#include <QRect> +#include <QWidget> +#include <QApplication> +#include <QDesktopWidget> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/tooltip/tipcontents.cpp b/src/plugins/texteditor/tooltip/tipcontents.cpp index aeaa7c7cb2..0b047a9b65 100644 --- a/src/plugins/texteditor/tooltip/tipcontents.cpp +++ b/src/plugins/texteditor/tooltip/tipcontents.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace TextEditor { diff --git a/src/plugins/texteditor/tooltip/tipcontents.h b/src/plugins/texteditor/tooltip/tipcontents.h index 19b3db96d2..3b9d69a330 100644 --- a/src/plugins/texteditor/tooltip/tipcontents.h +++ b/src/plugins/texteditor/tooltip/tipcontents.h @@ -35,8 +35,8 @@ #include "texteditor/texteditor_global.h" -#include <QtCore/QString> -#include <QtGui/QColor> +#include <QString> +#include <QColor> namespace TextEditor { diff --git a/src/plugins/texteditor/tooltip/tipfactory.cpp b/src/plugins/texteditor/tooltip/tipfactory.cpp index 74e3172b81..78f178a124 100644 --- a/src/plugins/texteditor/tooltip/tipfactory.cpp +++ b/src/plugins/texteditor/tooltip/tipfactory.cpp @@ -35,7 +35,7 @@ #include "tips.h" #include <utils/qtcassert.h> -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/tooltip/tipfactory.h b/src/plugins/texteditor/tooltip/tipfactory.h index 735fb7a3ae..0290dd8ed5 100644 --- a/src/plugins/texteditor/tooltip/tipfactory.h +++ b/src/plugins/texteditor/tooltip/tipfactory.h @@ -33,7 +33,7 @@ #ifndef TIPFACTORY_H #define TIPFACTORY_H -#include <QtGui/QWidget> +#include <QWidget> namespace TextEditor { diff --git a/src/plugins/texteditor/tooltip/tips.cpp b/src/plugins/texteditor/tooltip/tips.cpp index 98c5cb1bbe..cef73cd745 100644 --- a/src/plugins/texteditor/tooltip/tips.cpp +++ b/src/plugins/texteditor/tooltip/tips.cpp @@ -36,19 +36,19 @@ #include <utils/qtcassert.h> -#include <QtCore/QRect> -#include <QtGui/QColor> -#include <QtGui/QPainter> -#include <QtGui/QPen> -#include <QtGui/QPixmap> -#include <QtGui/QStyle> -#include <QtGui/QFontMetrics> -#include <QtGui/QTextDocument> -#include <QtGui/QStylePainter> -#include <QtGui/QStyleOptionFrame> -#include <QtGui/QResizeEvent> -#include <QtGui/QPaintEvent> -#include <QtGui/QVBoxLayout> +#include <QRect> +#include <QColor> +#include <QPainter> +#include <QPen> +#include <QPixmap> +#include <QStyle> +#include <QFontMetrics> +#include <QTextDocument> +#include <QStylePainter> +#include <QStyleOptionFrame> +#include <QResizeEvent> +#include <QPaintEvent> +#include <QVBoxLayout> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/tooltip/tips.h b/src/plugins/texteditor/tooltip/tips.h index ed22135ae5..1afa669bd6 100644 --- a/src/plugins/texteditor/tooltip/tips.h +++ b/src/plugins/texteditor/tooltip/tips.h @@ -33,9 +33,9 @@ #ifndef TIPS_H #define TIPS_H -#include <QtCore/QSharedPointer> -#include <QtGui/QLabel> -#include <QtGui/QPixmap> +#include <QSharedPointer> +#include <QLabel> +#include <QPixmap> QT_FORWARD_DECLARE_CLASS(QVBoxLayout) diff --git a/src/plugins/texteditor/tooltip/tooltip.cpp b/src/plugins/texteditor/tooltip/tooltip.cpp index ad4ee2750c..bdb2707c9e 100644 --- a/src/plugins/texteditor/tooltip/tooltip.cpp +++ b/src/plugins/texteditor/tooltip/tooltip.cpp @@ -37,14 +37,14 @@ #include "effects.h" #include "reuse.h" -#include <QtCore/QString> -#include <QtGui/QColor> -#include <QtGui/QApplication> -#include <QtGui/QKeyEvent> -#include <QtGui/QMouseEvent> -#include <QtGui/QMenu> +#include <QString> +#include <QColor> +#include <QApplication> +#include <QKeyEvent> +#include <QMouseEvent> +#include <QMenu> -#include <QtCore/QDebug> +#include <QDebug> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/tooltip/tooltip.h b/src/plugins/texteditor/tooltip/tooltip.h index abc7ef83f1..d9f1b3948d 100644 --- a/src/plugins/texteditor/tooltip/tooltip.h +++ b/src/plugins/texteditor/tooltip/tooltip.h @@ -35,11 +35,11 @@ #include "texteditor/texteditor_global.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QObject> -#include <QtCore/QTimer> -#include <QtCore/QRect> -#include <QtGui/QFont> +#include <QSharedPointer> +#include <QObject> +#include <QTimer> +#include <QRect> +#include <QFont> /* * In its current form QToolTip is not extensible. So this is an attempt to provide a more diff --git a/src/plugins/texteditor/typingsettings.cpp b/src/plugins/texteditor/typingsettings.cpp index d16a292d86..547e8360e3 100644 --- a/src/plugins/texteditor/typingsettings.cpp +++ b/src/plugins/texteditor/typingsettings.cpp @@ -33,8 +33,8 @@ #include "typingsettings.h" #include <utils/settingsutils.h> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> +#include <QTextCursor> +#include <QTextDocument> static const char autoIndentKey[] = "AutoIndent"; static const char tabKeyBehaviorKey[] = "TabKeyBehavior"; diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h index ca93380209..2280e4e459 100644 --- a/src/plugins/texteditor/typingsettings.h +++ b/src/plugins/texteditor/typingsettings.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtCore/QVariant> -#include <QtGui/QTextBlock> +#include <QVariant> +#include <QTextBlock> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/updateinfo/updateinfobutton.cpp b/src/plugins/updateinfo/updateinfobutton.cpp index 3a2f90b93b..6417dbffa7 100644 --- a/src/plugins/updateinfo/updateinfobutton.cpp +++ b/src/plugins/updateinfo/updateinfobutton.cpp @@ -35,8 +35,8 @@ #include <coreplugin/coreconstants.h> #include <utils/stylehelper.h> -#include <QtGui/QIcon> -#include <QtGui/QPainter> +#include <QIcon> +#include <QPainter> namespace UpdateInfo { diff --git a/src/plugins/updateinfo/updateinfobutton.h b/src/plugins/updateinfo/updateinfobutton.h index 68600628a7..3060f34c5d 100644 --- a/src/plugins/updateinfo/updateinfobutton.h +++ b/src/plugins/updateinfo/updateinfobutton.h @@ -33,7 +33,7 @@ #ifndef UPDATEINFOBUTTON_H #define UPDATEINFOBUTTON_H -#include <QtGui/QAbstractButton> +#include <QAbstractButton> namespace UpdateInfo { namespace Internal { diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index c57be57f13..f64b20cf9d 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -43,19 +43,19 @@ #include <qtconcurrentrun.h> -#include <QtCore/QtPlugin> -#include <QtCore/QProcess> -#include <QtCore/QTimer> -#include <QtCore/QTimerEvent> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QThread> -#include <QtCore/QCoreApplication> -#include <QtCore/QProcess> -#include <QtXml/QDomDocument> -#include <QtGui/QMessageBox> -#include <QtGui/QMenu> -#include <QtCore/QFutureWatcher> +#include <QtPlugin> +#include <QProcess> +#include <QTimer> +#include <QTimerEvent> +#include <QDebug> +#include <QFile> +#include <QThread> +#include <QCoreApplication> +#include <QProcess> +#include <QDomDocument> +#include <QMessageBox> +#include <QMenu> +#include <QFutureWatcher> namespace { static const quint32 OneMinute = 60000; diff --git a/src/plugins/updateinfo/updateinfoplugin.h b/src/plugins/updateinfo/updateinfoplugin.h index 0ac0508a00..fdc4c4c0e5 100644 --- a/src/plugins/updateinfo/updateinfoplugin.h +++ b/src/plugins/updateinfo/updateinfoplugin.h @@ -35,7 +35,7 @@ #include <extensionsystem/iplugin.h> -#include <QtXml/QDomDocument> +#include <QDomDocument> namespace UpdateInfo { namespace Internal { diff --git a/src/plugins/valgrind/callgrind/callgrindabstractmodel.h b/src/plugins/valgrind/callgrind/callgrindabstractmodel.h index eb0e065d34..5d6a6657e4 100644 --- a/src/plugins/valgrind/callgrind/callgrindabstractmodel.h +++ b/src/plugins/valgrind/callgrind/callgrindabstractmodel.h @@ -33,7 +33,7 @@ #ifndef LIBVALGRIND_CALLGRINDABSTRACTMODEL_H #define LIBVALGRIND_CALLGRINDABSTRACTMODEL_H -#include <QtGui/QAbstractItemView> +#include <QAbstractItemView> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindcallmodel.h b/src/plugins/valgrind/callgrind/callgrindcallmodel.h index fd980af47f..0047f11804 100644 --- a/src/plugins/valgrind/callgrind/callgrindcallmodel.h +++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.h @@ -33,7 +33,7 @@ #ifndef VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H #define VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> #include "callgrindabstractmodel.h" diff --git a/src/plugins/valgrind/callgrind/callgrindcostitem.cpp b/src/plugins/valgrind/callgrind/callgrindcostitem.cpp index a77cdcf846..d2683be447 100644 --- a/src/plugins/valgrind/callgrind/callgrindcostitem.cpp +++ b/src/plugins/valgrind/callgrind/callgrindcostitem.cpp @@ -32,9 +32,9 @@ #include "callgrindcostitem.h" -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QString> +#include <QStringList> +#include <QVector> #include "callgrindparsedata.h" #include "callgrindfunctioncall.h" diff --git a/src/plugins/valgrind/callgrind/callgrindcostitem.h b/src/plugins/valgrind/callgrind/callgrindcostitem.h index cf370d2c98..be7e7a10e4 100644 --- a/src/plugins/valgrind/callgrind/callgrindcostitem.h +++ b/src/plugins/valgrind/callgrind/callgrindcostitem.h @@ -33,7 +33,7 @@ #ifndef LIBVALGRIND_CALLGRIND_COSTITEM_H #define LIBVALGRIND_CALLGRIND_COSTITEM_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp index 4bae3a6ae7..f7e1ab1e64 100644 --- a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp +++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp @@ -39,7 +39,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> +#include <QDebug> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindcycledetection.h b/src/plugins/valgrind/callgrind/callgrindcycledetection.h index 4b6be5a994..dac75894f6 100644 --- a/src/plugins/valgrind/callgrind/callgrindcycledetection.h +++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.h @@ -33,8 +33,8 @@ #ifndef LIBVALGRIND_CALLGRINDCYCLEDETECTION_H #define LIBVALGRIND_CALLGRINDCYCLEDETECTION_H -#include <QtCore/QHash> -#include <QtCore/QStack> +#include <QHash> +#include <QStack> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp index 7578c39165..7f93b77767 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp @@ -38,10 +38,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QChar> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QChar> +#include <QDebug> +#include <QStringList> +#include <QVector> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.h b/src/plugins/valgrind/callgrind/callgrinddatamodel.h index dcf0be8e8c..429ad14d59 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.h +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.h @@ -35,7 +35,7 @@ #include "callgrindabstractmodel.h" -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp index 1223f8cf04..d218d774a4 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction.cpp +++ b/src/plugins/valgrind/callgrind/callgrindfunction.cpp @@ -39,11 +39,11 @@ #include <utils/qtcassert.h> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> +#include <QString> +#include <QStringList> +#include <QDebug> +#include <QFileInfo> +#include <QCoreApplication> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.h b/src/plugins/valgrind/callgrind/callgrindfunction.h index 70d333112d..49bf9500f5 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction.h +++ b/src/plugins/valgrind/callgrind/callgrindfunction.h @@ -33,8 +33,8 @@ #ifndef LIBVALGRIND_CALLGRIND_FUNCTION_H #define LIBVALGRIND_CALLGRIND_FUNCTION_H -#include <QtCore/QMetaType> -#include <QtCore/QVector> +#include <QMetaType> +#include <QVector> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunction_p.h b/src/plugins/valgrind/callgrind/callgrindfunction_p.h index e4031e74da..9b90e6f44f 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction_p.h +++ b/src/plugins/valgrind/callgrind/callgrindfunction_p.h @@ -38,8 +38,8 @@ #include "callgrindcostitem.h" #include "callgrindfunctioncall.h" -#include <QtCore/QVector> -#include <QtCore/QHash> +#include <QVector> +#include <QHash> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp b/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp index f396bcff99..412065936d 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp +++ b/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QVector> +#include <QVector> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncall.h b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h index 41e6a65ab8..3a90ac826b 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunctioncall.h +++ b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h @@ -33,7 +33,7 @@ #ifndef LIBVALGRIND_CALLGRIND_CALLEE_H #define LIBVALGRIND_CALLGRIND_CALLEE_H -#include <QtCore/QMetaType> +#include <QMetaType> QT_BEGIN_NAMESPACE template <typename T> class QVector; diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp index 1e0bf0c427..a57dbcc82c 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp +++ b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp @@ -36,8 +36,8 @@ #include "callgrindfunctioncall.h" #include "callgrindparsedata.h" -#include <QtCore/QStringList> -#include <QtCore/QDebug> +#include <QStringList> +#include <QDebug> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp index 351a434c57..4964b9a5b9 100644 --- a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp @@ -38,10 +38,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QStringList> -#include <QtCore/QVector> -#include <QtCore/QHash> -#include <QtCore/QCoreApplication> +#include <QStringList> +#include <QVector> +#include <QHash> +#include <QCoreApplication> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.h b/src/plugins/valgrind/callgrind/callgrindparsedata.h index 0982ac2009..21f9e6f246 100644 --- a/src/plugins/valgrind/callgrind/callgrindparsedata.h +++ b/src/plugins/valgrind/callgrind/callgrindparsedata.h @@ -33,7 +33,7 @@ #ifndef LIBVALGRIND_CALLGRIND_PARSEDATA_P_H #define LIBVALGRIND_CALLGRIND_PARSEDATA_P_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp index fb55c2d7e4..b2025a6141 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp @@ -39,10 +39,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QHash> -#include <QtCore/QVector> -#include <QtCore/QStringList> -#include <QtCore/QDebug> +#include <QHash> +#include <QVector> +#include <QStringList> +#include <QDebug> // #define DEBUG_PARSER diff --git a/src/plugins/valgrind/callgrind/callgrindrunner.cpp b/src/plugins/valgrind/callgrind/callgrindrunner.cpp index 9c50cba366..127dfa72a9 100644 --- a/src/plugins/valgrind/callgrind/callgrindrunner.cpp +++ b/src/plugins/valgrind/callgrind/callgrindrunner.cpp @@ -35,7 +35,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QFile> +#include <QFile> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrindcostdelegate.cpp b/src/plugins/valgrind/callgrindcostdelegate.cpp index 8857a63509..b8aea6f9eb 100644 --- a/src/plugins/valgrind/callgrindcostdelegate.cpp +++ b/src/plugins/valgrind/callgrindcostdelegate.cpp @@ -40,8 +40,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QApplication> -#include <QtGui/QPainter> +#include <QApplication> +#include <QPainter> using namespace Valgrind::Callgrind; diff --git a/src/plugins/valgrind/callgrindcostdelegate.h b/src/plugins/valgrind/callgrindcostdelegate.h index 85e640f4f7..615aeaa9e6 100644 --- a/src/plugins/valgrind/callgrindcostdelegate.h +++ b/src/plugins/valgrind/callgrindcostdelegate.h @@ -33,7 +33,7 @@ #ifndef CALLGRINDCOSTDELEGATE_H #define CALLGRINDCOSTDELEGATE_H -#include <QtGui/QStyledItemDelegate> +#include <QStyledItemDelegate> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindcostview.cpp b/src/plugins/valgrind/callgrindcostview.cpp index ff768d8072..6f03017a4e 100644 --- a/src/plugins/valgrind/callgrindcostview.cpp +++ b/src/plugins/valgrind/callgrindcostview.cpp @@ -39,9 +39,9 @@ #include <valgrind/callgrind/callgrindfunction.h> #include <valgrind/callgrind/callgrindcallmodel.h> -#include <QtGui/QAbstractProxyModel> -#include <QtGui/QHeaderView> -#include <QtCore/QDebug> +#include <QAbstractProxyModel> +#include <QHeaderView> +#include <QDebug> using namespace Valgrind::Callgrind; diff --git a/src/plugins/valgrind/callgrindcostview.h b/src/plugins/valgrind/callgrindcostview.h index 22f3dfbd0c..d58e30a0dd 100644 --- a/src/plugins/valgrind/callgrindcostview.h +++ b/src/plugins/valgrind/callgrindcostview.h @@ -35,7 +35,7 @@ #include "callgrindcostdelegate.h" -#include <QtGui/QTreeView> +#include <QTreeView> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindhelper.cpp b/src/plugins/valgrind/callgrindhelper.cpp index 3918c1d23c..511da71bc0 100644 --- a/src/plugins/valgrind/callgrindhelper.cpp +++ b/src/plugins/valgrind/callgrindhelper.cpp @@ -34,9 +34,9 @@ #include <cstdlib> -#include <QtGui/QColor> -#include <QtCore/QMap> -#include <QtCore/QString> +#include <QColor> +#include <QMap> +#include <QString> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindhelper.h b/src/plugins/valgrind/callgrindhelper.h index fbf66ca1ac..43c5e4c589 100644 --- a/src/plugins/valgrind/callgrindhelper.h +++ b/src/plugins/valgrind/callgrindhelper.h @@ -33,7 +33,7 @@ #ifndef CALLGRINDHELPER_H #define CALLGRINDHELPER_H -#include <QtCore/QLocale> +#include <QLocale> QT_BEGIN_NAMESPACE class QColor; diff --git a/src/plugins/valgrind/callgrindnamedelegate.cpp b/src/plugins/valgrind/callgrindnamedelegate.cpp index 9bef2483df..a88b9e7a5c 100644 --- a/src/plugins/valgrind/callgrindnamedelegate.cpp +++ b/src/plugins/valgrind/callgrindnamedelegate.cpp @@ -34,8 +34,8 @@ #include "callgrindhelper.h" -#include <QtGui/QApplication> -#include <QtGui/QPainter> +#include <QApplication> +#include <QPainter> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindnamedelegate.h b/src/plugins/valgrind/callgrindnamedelegate.h index d14afe7f0e..171da5b371 100644 --- a/src/plugins/valgrind/callgrindnamedelegate.h +++ b/src/plugins/valgrind/callgrindnamedelegate.h @@ -33,7 +33,7 @@ #ifndef CALLGRINDNAMEDELEGATE_H #define CALLGRINDNAMEDELEGATE_H -#include <QtGui/QStyledItemDelegate> +#include <QStyledItemDelegate> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindtextmark.cpp b/src/plugins/valgrind/callgrindtextmark.cpp index 5a8abde5eb..aa524442d9 100644 --- a/src/plugins/valgrind/callgrindtextmark.cpp +++ b/src/plugins/valgrind/callgrindtextmark.cpp @@ -37,8 +37,8 @@ #include "callgrind/callgrinddatamodel.h" #include "callgrind/callgrindfunction.h" -#include <QtCore/QDebug> -#include <QtGui/QPainter> +#include <QDebug> +#include <QPainter> #include <utils/qtcassert.h> diff --git a/src/plugins/valgrind/callgrindtextmark.h b/src/plugins/valgrind/callgrindtextmark.h index e7d016b557..effd57ae58 100644 --- a/src/plugins/valgrind/callgrindtextmark.h +++ b/src/plugins/valgrind/callgrindtextmark.h @@ -35,7 +35,7 @@ #include <texteditor/basetextmark.h> -#include <QtCore/QPersistentModelIndex> +#include <QPersistentModelIndex> namespace Valgrind { diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 81261ef513..dd3287f251 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -74,23 +74,23 @@ #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> - -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QDockWidget> -#include <QtGui/QGraphicsItem> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QMenu> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QVBoxLayout> +#include <QFile> +#include <QFileInfo> +#include <QTimer> + +#include <QAction> +#include <QActionGroup> +#include <QCheckBox> +#include <QComboBox> +#include <QDockWidget> +#include <QGraphicsItem> +#include <QHBoxLayout> +#include <QLineEdit> +#include <QMenu> +#include <QSortFilterProxyModel> +#include <QToolBar> +#include <QToolButton> +#include <QVBoxLayout> // shared/cplusplus includes #include <Symbols.h> diff --git a/src/plugins/valgrind/callgrindvisualisation.cpp b/src/plugins/valgrind/callgrindvisualisation.cpp index fa616f151c..3a43d45f4b 100644 --- a/src/plugins/valgrind/callgrindvisualisation.cpp +++ b/src/plugins/valgrind/callgrindvisualisation.cpp @@ -40,17 +40,17 @@ #include <valgrind/callgrind/callgrindproxymodel.h> #include <utils/qtcassert.h> -#include <QtGui/QGraphicsRectItem> -#include <QtGui/QGraphicsScene> -#include <QtGui/QGraphicsSimpleTextItem> -#include <QtGui/QMouseEvent> -#include <QtGui/QStaticText> -#include <QtGui/QStyleOptionGraphicsItem> -#include <QtCore/QPair> -#include <QtCore/QPersistentModelIndex> -#include <QtCore/QLinkedList> -#include <QtCore/QAbstractItemModel> -#include <QtCore/QDebug> +#include <QGraphicsRectItem> +#include <QGraphicsScene> +#include <QGraphicsSimpleTextItem> +#include <QMouseEvent> +#include <QStaticText> +#include <QStyleOptionGraphicsItem> +#include <QPair> +#include <QPersistentModelIndex> +#include <QLinkedList> +#include <QAbstractItemModel> +#include <QDebug> #define VISUALISATION_DEBUG 0 // Margin from hardcoded value in: diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h index 8067e3c4fc..ec059ad3d5 100644 --- a/src/plugins/valgrind/callgrindvisualisation.h +++ b/src/plugins/valgrind/callgrindvisualisation.h @@ -33,7 +33,7 @@ #ifndef CALLGRINDVISUALISATION_H #define CALLGRINDVISUALISATION_H -#include <QtGui/QGraphicsView> +#include <QGraphicsView> QT_BEGIN_NAMESPACE class QAbstractItemModel; diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.cpp b/src/plugins/valgrind/memcheck/memcheckrunner.cpp index 62154d6ab0..d48d85d767 100644 --- a/src/plugins/valgrind/memcheck/memcheckrunner.cpp +++ b/src/plugins/valgrind/memcheck/memcheckrunner.cpp @@ -40,16 +40,16 @@ #include <utils/qtcassert.h> -#include <QtNetwork/QNetworkInterface> -#include <QtNetwork/QTcpServer> -#include <QtNetwork/QTcpSocket> -#include <QtCore/QEventLoop> -#include <QtGui/QApplication> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLabel> -#include <QtGui/QListWidget> -#include <QtGui/QVBoxLayout> +#include <QNetworkInterface> +#include <QTcpServer> +#include <QTcpSocket> +#include <QEventLoop> +#include <QApplication> +#include <QDialog> +#include <QDialogButtonBox> +#include <QLabel> +#include <QListWidget> +#include <QVBoxLayout> namespace Valgrind { namespace Memcheck { diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index 61dd919f9c..fcecff6680 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -50,20 +50,20 @@ #include <texteditor/basetexteditor.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QDebug> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QLabel> -#include <QtGui/QListView> -#include <QtGui/QMenu> -#include <QtGui/QPainter> -#include <QtGui/QScrollBar> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QStyledItemDelegate> -#include <QtGui/QVBoxLayout> +#include <QDir> +#include <QDebug> + +#include <QAction> +#include <QApplication> +#include <QClipboard> +#include <QLabel> +#include <QListView> +#include <QMenu> +#include <QPainter> +#include <QScrollBar> +#include <QSortFilterProxyModel> +#include <QStyledItemDelegate> +#include <QVBoxLayout> using namespace Valgrind::XmlProtocol; diff --git a/src/plugins/valgrind/memcheckerrorview.h b/src/plugins/valgrind/memcheckerrorview.h index 6aa10ccf5e..1c00316a03 100644 --- a/src/plugins/valgrind/memcheckerrorview.h +++ b/src/plugins/valgrind/memcheckerrorview.h @@ -35,7 +35,7 @@ #ifndef MEMCHECKERRORVIEW_H #define MEMCHECKERRORVIEW_H -#include <QtGui/QListView> +#include <QListView> namespace Analyzer { class AnalyzerSettings; } diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 358155f1a5..e93b10353d 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -71,22 +71,22 @@ #include <utils/styledbar.h> #include <utils/qtcassert.h> -#include <QtCore/QString> -#include <QtCore/QLatin1String> -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtCore/QDir> - -#include <QtGui/QDockWidget> -#include <QtGui/QHBoxLayout> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> -#include <QtGui/QSpinBox> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QToolButton> -#include <QtGui/QCheckBox> +#include <QString> +#include <QLatin1String> +#include <QFileInfo> +#include <QFile> +#include <QDir> + +#include <QDockWidget> +#include <QHBoxLayout> +#include <QComboBox> +#include <QLabel> +#include <QSpinBox> +#include <QAction> +#include <QMenu> +#include <QMessageBox> +#include <QToolButton> +#include <QCheckBox> #include <utils/stylehelper.h> using namespace Analyzer; diff --git a/src/plugins/valgrind/memchecktool.h b/src/plugins/valgrind/memchecktool.h index 25d0b997ad..52339735d8 100644 --- a/src/plugins/valgrind/memchecktool.h +++ b/src/plugins/valgrind/memchecktool.h @@ -37,8 +37,8 @@ #include "valgrindtool.h" -#include <QtGui/QSortFilterProxyModel> -#include <QtCore/QSharedPointer> +#include <QSortFilterProxyModel> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QItemSelection; diff --git a/src/plugins/valgrind/suppressiondialog.cpp b/src/plugins/valgrind/suppressiondialog.cpp index a0e43656e9..c61c14104b 100644 --- a/src/plugins/valgrind/suppressiondialog.cpp +++ b/src/plugins/valgrind/suppressiondialog.cpp @@ -51,13 +51,13 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QFile> +#include <QFile> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QFormLayout> -#include <QtGui/QPushButton> -#include <QtGui/QLabel> -#include <QtGui/QPlainTextEdit> +#include <QDialogButtonBox> +#include <QFormLayout> +#include <QPushButton> +#include <QLabel> +#include <QPlainTextEdit> using namespace Analyzer; using namespace Valgrind::XmlProtocol; diff --git a/src/plugins/valgrind/suppressiondialog.h b/src/plugins/valgrind/suppressiondialog.h index b3533ee6c0..5ce198355e 100644 --- a/src/plugins/valgrind/suppressiondialog.h +++ b/src/plugins/valgrind/suppressiondialog.h @@ -39,7 +39,7 @@ #include <utils/pathchooser.h> -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QPlainTextEdit; diff --git a/src/plugins/valgrind/valgrindconfigwidget.cpp b/src/plugins/valgrind/valgrindconfigwidget.cpp index d4a8d4df00..8eb794e26a 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.cpp +++ b/src/plugins/valgrind/valgrindconfigwidget.cpp @@ -39,10 +39,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QStandardItemModel> -#include <QtGui/QFileDialog> +#include <QStandardItemModel> +#include <QFileDialog> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h index 1593b7005c..962bb88979 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.h +++ b/src/plugins/valgrind/valgrindconfigwidget.h @@ -35,7 +35,7 @@ #ifndef ANALYZER_VALGRINDCONFIGWIDGET_H #define ANALYZER_VALGRINDCONFIGWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 7cc70ca9f7..ce62cec6f3 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -43,8 +43,8 @@ #include <projectexplorer/applicationrunconfiguration.h> #include <analyzerbase/analyzermanager.h> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> +#include <QApplication> +#include <QMainWindow> #define VALGRIND_DEBUG_OUTPUT 0 diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h index e93967040f..e8ba1bcf85 100644 --- a/src/plugins/valgrind/valgrindengine.h +++ b/src/plugins/valgrind/valgrindengine.h @@ -41,10 +41,10 @@ #include <valgrind/valgrindrunner.h> -#include <QtCore/QString> -#include <QtCore/QByteArray> -#include <QtCore/QFutureInterface> -#include <QtCore/QFutureWatcher> +#include <QString> +#include <QByteArray> +#include <QFutureInterface> +#include <QFutureWatcher> namespace Analyzer { class AnalyzerSettings; diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp index a2c6169de5..43c1b2e275 100644 --- a/src/plugins/valgrind/valgrindplugin.cpp +++ b/src/plugins/valgrind/valgrindplugin.cpp @@ -52,10 +52,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> +#include <QDebug> +#include <QStringList> +#include <QtPlugin> +#include <QAction> using namespace Analyzer; using namespace ProjectExplorer; diff --git a/src/plugins/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp index 3e2ddb2a93..8ae5bc20a8 100644 --- a/src/plugins/valgrind/valgrindprocess.cpp +++ b/src/plugins/valgrind/valgrindprocess.cpp @@ -34,14 +34,14 @@ #include "valgrindprocess.h" -#include <QtCore/QDebug> -#include <QtCore/QEventLoop> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QEventLoop> +#include <QFileInfo> #include <utils/qtcassert.h> #ifdef Q_OS_WIN -# include <QtCore/qt_windows.h> +# include <qt_windows.h> #endif namespace Valgrind { diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index afe1f93e70..2c7e8e1c82 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/src/plugins/valgrind/valgrindrunner.cpp @@ -41,7 +41,7 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocess.h> -#include <QtCore/QEventLoop> +#include <QEventLoop> namespace Valgrind { diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h index 5d77afc742..1531024cef 100644 --- a/src/plugins/valgrind/valgrindrunner.h +++ b/src/plugins/valgrind/valgrindrunner.h @@ -40,7 +40,7 @@ #include <utils/outputformat.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QProcess> +#include <QProcess> namespace Utils { class Environment; diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp index 8a5fa10f19..ea60061115 100644 --- a/src/plugins/valgrind/valgrindsettings.cpp +++ b/src/plugins/valgrind/valgrindsettings.cpp @@ -39,8 +39,8 @@ #include <utils/qtcassert.h> #include <valgrind/xmlprotocol/error.h> -#include <QtCore/QSettings> -#include <QtCore/QDebug> +#include <QSettings> +#include <QDebug> using namespace Analyzer; diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h index 1c8eed49e1..fbafa135e6 100644 --- a/src/plugins/valgrind/valgrindsettings.h +++ b/src/plugins/valgrind/valgrindsettings.h @@ -38,9 +38,9 @@ #include <analyzerbase/analyzersettings.h> #include "callgrindcostdelegate.h" -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QVariant> +#include <QObject> +#include <QString> +#include <QVariant> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/workarounds.cpp b/src/plugins/valgrind/workarounds.cpp index 532b415a22..5bf131834d 100644 --- a/src/plugins/valgrind/workarounds.cpp +++ b/src/plugins/valgrind/workarounds.cpp @@ -32,7 +32,7 @@ #include "workarounds.h" -#include <QtGui/QPalette> +#include <QPalette> #include <utils/stylehelper.h> diff --git a/src/plugins/valgrind/workarounds.h b/src/plugins/valgrind/workarounds.h index 27c0996c19..b83b615841 100644 --- a/src/plugins/valgrind/workarounds.h +++ b/src/plugins/valgrind/workarounds.h @@ -33,7 +33,7 @@ #ifndef WORKAROUNDS_H #define WORKAROUNDS_H -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE class QPalette; diff --git a/src/plugins/valgrind/xmlprotocol/announcethread.cpp b/src/plugins/valgrind/xmlprotocol/announcethread.cpp index dca5af7804..351fc6c0cb 100644 --- a/src/plugins/valgrind/xmlprotocol/announcethread.cpp +++ b/src/plugins/valgrind/xmlprotocol/announcethread.cpp @@ -35,8 +35,8 @@ #include "announcethread.h" #include "frame.h" -#include <QtCore/QSharedData> -#include <QtCore/QVector> +#include <QSharedData> +#include <QVector> #include <algorithm> diff --git a/src/plugins/valgrind/xmlprotocol/announcethread.h b/src/plugins/valgrind/xmlprotocol/announcethread.h index 04427993a3..0d6eb952c8 100644 --- a/src/plugins/valgrind/xmlprotocol/announcethread.h +++ b/src/plugins/valgrind/xmlprotocol/announcethread.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H #define LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE template <typename T> class QVector; diff --git a/src/plugins/valgrind/xmlprotocol/error.cpp b/src/plugins/valgrind/xmlprotocol/error.cpp index 3e09c6d8c1..3d4ec6fa73 100644 --- a/src/plugins/valgrind/xmlprotocol/error.cpp +++ b/src/plugins/valgrind/xmlprotocol/error.cpp @@ -37,12 +37,12 @@ #include "stack.h" #include "suppression.h" -#include <QtCore/QSharedData> -#include <QtCore/QString> -#include <QtCore/QTextStream> -#include <QtCore/QVector> +#include <QSharedData> +#include <QString> +#include <QTextStream> +#include <QVector> -#include <QtCore/QtAlgorithms> +#include <QtAlgorithms> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/error.h b/src/plugins/valgrind/xmlprotocol/error.h index 98431fbb5a..1f8e0b66ca 100644 --- a/src/plugins/valgrind/xmlprotocol/error.h +++ b/src/plugins/valgrind/xmlprotocol/error.h @@ -35,8 +35,8 @@ #ifndef LIBVALGRIND_PROTOCOL_ERROR_H #define LIBVALGRIND_PROTOCOL_ERROR_H -#include <QtCore/QMetaType> -#include <QtCore/QSharedDataPointer> +#include <QMetaType> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp index a11977ba5d..44ea8f3f4b 100644 --- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp +++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp @@ -40,8 +40,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QVector> +#include <QDir> +#include <QVector> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h index bdcd069c9d..98d4e5cdb8 100644 --- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h +++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h @@ -35,8 +35,8 @@ #ifndef LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H #define LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QSharedPointer> +#include <QAbstractItemModel> +#include <QSharedPointer> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/frame.cpp b/src/plugins/valgrind/xmlprotocol/frame.cpp index dd21dad135..4dde5861ae 100644 --- a/src/plugins/valgrind/xmlprotocol/frame.cpp +++ b/src/plugins/valgrind/xmlprotocol/frame.cpp @@ -34,8 +34,8 @@ #include "frame.h" -#include <QtCore/QString> -#include <QtCore/QtAlgorithms> +#include <QString> +#include <QtAlgorithms> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/frame.h b/src/plugins/valgrind/xmlprotocol/frame.h index 651bd4f2af..543072f2f8 100644 --- a/src/plugins/valgrind/xmlprotocol/frame.h +++ b/src/plugins/valgrind/xmlprotocol/frame.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_FRAME_H #define LIBVALGRIND_PROTOCOL_FRAME_H -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp index b63771ef63..f3006fc3a1 100644 --- a/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp +++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp @@ -35,10 +35,10 @@ #include "modelhelpers.h" #include "frame.h" -#include <QtCore/QString> -#include <QtCore/QDir> -#include <QtCore/QPair> -#include <QtCore/QCoreApplication> +#include <QString> +#include <QDir> +#include <QPair> +#include <QCoreApplication> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/modelhelpers.h b/src/plugins/valgrind/xmlprotocol/modelhelpers.h index 1e41adb018..d9704bd060 100644 --- a/src/plugins/valgrind/xmlprotocol/modelhelpers.h +++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_MODELHELPERS_H #define LIBVALGRIND_PROTOCOL_MODELHELPERS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp index f434c01e06..a49f6654d3 100644 --- a/src/plugins/valgrind/xmlprotocol/parser.cpp +++ b/src/plugins/valgrind/xmlprotocol/parser.cpp @@ -41,13 +41,13 @@ #include "suppression.h" #include <utils/qtcassert.h> -#include <QtNetwork/QAbstractSocket> -#include <QtCore/QCoreApplication> -#include <QtCore/QHash> -#include <QtCore/QIODevice> -#include <QtCore/QPair> -#include <QtCore/QThread> -#include <QtCore/QXmlStreamReader> +#include <QAbstractSocket> +#include <QCoreApplication> +#include <QHash> +#include <QIODevice> +#include <QPair> +#include <QThread> +#include <QXmlStreamReader> namespace { diff --git a/src/plugins/valgrind/xmlprotocol/parser.h b/src/plugins/valgrind/xmlprotocol/parser.h index 15994f8688..17a2e771ab 100644 --- a/src/plugins/valgrind/xmlprotocol/parser.h +++ b/src/plugins/valgrind/xmlprotocol/parser.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_PARSER_H #define LIBVALGRIND_PROTOCOL_PARSER_H -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/plugins/valgrind/xmlprotocol/stack.cpp b/src/plugins/valgrind/xmlprotocol/stack.cpp index 287c044fb8..442df446c1 100644 --- a/src/plugins/valgrind/xmlprotocol/stack.cpp +++ b/src/plugins/valgrind/xmlprotocol/stack.cpp @@ -35,9 +35,9 @@ #include "stack.h" #include "frame.h" -#include <QtCore/QSharedData> -#include <QtCore/QString> -#include <QtCore/QVector> +#include <QSharedData> +#include <QString> +#include <QVector> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/stack.h b/src/plugins/valgrind/xmlprotocol/stack.h index 09df809c08..56c9fc02f0 100644 --- a/src/plugins/valgrind/xmlprotocol/stack.h +++ b/src/plugins/valgrind/xmlprotocol/stack.h @@ -35,7 +35,7 @@ #ifndef VALGRIND_PROTOCOL_STACK_H #define VALGRIND_PROTOCOL_STACK_H -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE template <typename T> class QVector; diff --git a/src/plugins/valgrind/xmlprotocol/stackmodel.cpp b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp index 980f138dce..2c49b70e06 100644 --- a/src/plugins/valgrind/xmlprotocol/stackmodel.cpp +++ b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp @@ -40,8 +40,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QVector> +#include <QDir> +#include <QVector> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/stackmodel.h b/src/plugins/valgrind/xmlprotocol/stackmodel.h index 306ea613c5..5601410292 100644 --- a/src/plugins/valgrind/xmlprotocol/stackmodel.h +++ b/src/plugins/valgrind/xmlprotocol/stackmodel.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_STACKMODEL_H #define LIBVALGRIND_PROTOCOL_STACKMODEL_H -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/status.cpp b/src/plugins/valgrind/xmlprotocol/status.cpp index 91094bd6ba..cab522ed15 100644 --- a/src/plugins/valgrind/xmlprotocol/status.cpp +++ b/src/plugins/valgrind/xmlprotocol/status.cpp @@ -34,8 +34,8 @@ #include "status.h" -#include <QtCore/QSharedData> -#include <QtCore/QString> +#include <QSharedData> +#include <QString> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/status.h b/src/plugins/valgrind/xmlprotocol/status.h index a33b02e111..46d971b522 100644 --- a/src/plugins/valgrind/xmlprotocol/status.h +++ b/src/plugins/valgrind/xmlprotocol/status.h @@ -35,8 +35,8 @@ #ifndef LIBVALGRIND_PROTOCOL_STATUS_H #define LIBVALGRIND_PROTOCOL_STATUS_H -#include <QtCore/QMetaType> -#include <QtCore/QSharedDataPointer> +#include <QMetaType> +#include <QSharedDataPointer> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/suppression.cpp b/src/plugins/valgrind/xmlprotocol/suppression.cpp index 412215a662..a1ef9611c6 100644 --- a/src/plugins/valgrind/xmlprotocol/suppression.cpp +++ b/src/plugins/valgrind/xmlprotocol/suppression.cpp @@ -34,10 +34,10 @@ #include "suppression.h" -#include <QtCore/QSharedData> -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtCore/QTextStream> +#include <QSharedData> +#include <QString> +#include <QVector> +#include <QTextStream> #include <algorithm> diff --git a/src/plugins/valgrind/xmlprotocol/suppression.h b/src/plugins/valgrind/xmlprotocol/suppression.h index 4fdcb8fb43..5d7c6340e6 100644 --- a/src/plugins/valgrind/xmlprotocol/suppression.h +++ b/src/plugins/valgrind/xmlprotocol/suppression.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_SUPPRESSION_H #define LIBVALGRIND_PROTOCOL_SUPPRESSION_H -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/xmlprotocol/threadedparser.cpp b/src/plugins/valgrind/xmlprotocol/threadedparser.cpp index 98790ac2dc..4d5acf855b 100644 --- a/src/plugins/valgrind/xmlprotocol/threadedparser.cpp +++ b/src/plugins/valgrind/xmlprotocol/threadedparser.cpp @@ -40,9 +40,9 @@ #include "suppression.h" #include <utils/qtcassert.h> -#include <QtCore/QMetaType> -#include <QtCore/QThread> -#include <QtCore/QSharedPointer> +#include <QMetaType> +#include <QThread> +#include <QSharedPointer> namespace { diff --git a/src/plugins/valgrind/xmlprotocol/threadedparser.h b/src/plugins/valgrind/xmlprotocol/threadedparser.h index c0e5ba2271..afaa1a773b 100644 --- a/src/plugins/valgrind/xmlprotocol/threadedparser.h +++ b/src/plugins/valgrind/xmlprotocol/threadedparser.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_THREADEDPARSER_H #define LIBVALGRIND_PROTOCOL_THREADEDPARSER_H -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp index 489587b241..08c8831955 100644 --- a/src/plugins/vcsbase/baseannotationhighlighter.cpp +++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp @@ -33,12 +33,12 @@ #include "baseannotationhighlighter.h" #include <math.h> -#include <QtCore/QSet> -#include <QtCore/QDebug> -#include <QtGui/QColor> -#include <QtGui/QTextDocument> -#include <QtGui/QTextEdit> -#include <QtGui/QTextCharFormat> +#include <QSet> +#include <QDebug> +#include <QColor> +#include <QTextDocument> +#include <QTextEdit> +#include <QTextCharFormat> typedef QMap<QString, QTextCharFormat> ChangeNumberFormatMap; diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp index 9ef03dcc24..6876130588 100644 --- a/src/plugins/vcsbase/basecheckoutwizard.cpp +++ b/src/plugins/vcsbase/basecheckoutwizard.cpp @@ -38,10 +38,10 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QFileInfo> +#include <QDir> +#include <QMessageBox> /*! \class VcsBase::BaseCheckoutWizard diff --git a/src/plugins/vcsbase/basecheckoutwizard.h b/src/plugins/vcsbase/basecheckoutwizard.h index cf012709c9..0a46d1811b 100644 --- a/src/plugins/vcsbase/basecheckoutwizard.h +++ b/src/plugins/vcsbase/basecheckoutwizard.h @@ -36,8 +36,8 @@ #include "vcsbase_global.h" #include <coreplugin/dialogs/iwizard.h> -#include <QtCore/QSharedPointer> -#include <QtCore/QList> +#include <QSharedPointer> +#include <QList> QT_BEGIN_NAMESPACE class QWizardPage; diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.cpp b/src/plugins/vcsbase/basecheckoutwizardpage.cpp index 863db3d64c..21ee35db3e 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.cpp +++ b/src/plugins/vcsbase/basecheckoutwizardpage.cpp @@ -33,7 +33,7 @@ #include "basecheckoutwizardpage.h" #include "ui_basecheckoutwizardpage.h" -#include <QtGui/QIcon> +#include <QIcon> /*! \class VcsBase::BaseCheckoutWizardPage diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.h b/src/plugins/vcsbase/basecheckoutwizardpage.h index 0273372f1b..a00056d8cc 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.h +++ b/src/plugins/vcsbase/basecheckoutwizardpage.h @@ -35,7 +35,7 @@ #include "vcsbase_global.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace VcsBase { diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp index b1e5a2c699..bd32b2982b 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.cpp +++ b/src/plugins/vcsbase/basevcseditorfactory.cpp @@ -38,7 +38,7 @@ #include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditorsettings.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> /*! \class VcsBase::BaseVCSEditorFactory diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h index 1e145a7f94..72c5df4acc 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.h +++ b/src/plugins/vcsbase/basevcseditorfactory.h @@ -38,7 +38,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace VcsBase { namespace Internal { diff --git a/src/plugins/vcsbase/checkoutjobs.cpp b/src/plugins/vcsbase/checkoutjobs.cpp index fe7f27c9cb..297ab2997e 100644 --- a/src/plugins/vcsbase/checkoutjobs.cpp +++ b/src/plugins/vcsbase/checkoutjobs.cpp @@ -35,9 +35,9 @@ #include <vcsbaseplugin.h> #include <vcsbaseoutputwindow.h> -#include <QtCore/QDebug> -#include <QtCore/QQueue> -#include <QtCore/QDir> +#include <QDebug> +#include <QQueue> +#include <QDir> #include <utils/synchronousprocess.h> #include <utils/qtcassert.h> diff --git a/src/plugins/vcsbase/checkoutjobs.h b/src/plugins/vcsbase/checkoutjobs.h index dab3f97fdd..84bc45dc35 100644 --- a/src/plugins/vcsbase/checkoutjobs.h +++ b/src/plugins/vcsbase/checkoutjobs.h @@ -35,10 +35,10 @@ #include "vcsbase_global.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QProcess> -#include <QtCore/QProcessEnvironment> +#include <QObject> +#include <QStringList> +#include <QProcess> +#include <QProcessEnvironment> namespace VcsBase { diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp index 5bc36401c2..21994dce78 100644 --- a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp +++ b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp @@ -36,8 +36,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QApplication> -#include <QtGui/QCursor> +#include <QApplication> +#include <QCursor> /*! \class VcsBase::CheckoutProgressWizardPage diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.h b/src/plugins/vcsbase/checkoutprogresswizardpage.h index aa9f354bcc..c02348a2a0 100644 --- a/src/plugins/vcsbase/checkoutprogresswizardpage.h +++ b/src/plugins/vcsbase/checkoutprogresswizardpage.h @@ -33,8 +33,8 @@ #ifndef CHECKOUTPROGRESSWIZARDPAGE_H #define CHECKOUTPROGRESSWIZARDPAGE_H -#include <QtCore/QSharedPointer> -#include <QtGui/QWizardPage> +#include <QSharedPointer> +#include <QWizardPage> namespace VcsBase { class AbstractCheckoutJob; diff --git a/src/plugins/vcsbase/checkoutwizarddialog.cpp b/src/plugins/vcsbase/checkoutwizarddialog.cpp index 8a1054b277..c0fd913305 100644 --- a/src/plugins/vcsbase/checkoutwizarddialog.cpp +++ b/src/plugins/vcsbase/checkoutwizarddialog.cpp @@ -37,7 +37,7 @@ #include <coreplugin/basefilewizard.h> -#include <QtGui/QPushButton> +#include <QPushButton> /*! \class VcsBase::Internal::CheckoutWizardDialog diff --git a/src/plugins/vcsbase/checkoutwizarddialog.h b/src/plugins/vcsbase/checkoutwizarddialog.h index b5490f3d0f..320b96deea 100644 --- a/src/plugins/vcsbase/checkoutwizarddialog.h +++ b/src/plugins/vcsbase/checkoutwizarddialog.h @@ -33,8 +33,8 @@ #ifndef CHECKOUTWIZARDDIALOG_H #define CHECKOUTWIZARDDIALOG_H -#include <QtCore/QSharedPointer> -#include <QtCore/QList> +#include <QSharedPointer> +#include <QList> #include <utils/wizard.h> namespace VcsBase { diff --git a/src/plugins/vcsbase/cleandialog.cpp b/src/plugins/vcsbase/cleandialog.cpp index 57104638a6..4033cbb773 100644 --- a/src/plugins/vcsbase/cleandialog.cpp +++ b/src/plugins/vcsbase/cleandialog.cpp @@ -38,19 +38,19 @@ #include <coreplugin/icore.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <QtGui/QStandardItemModel> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> -#include <QtGui/QStyle> -#include <QtGui/QIcon> - -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QDateTime> -#include <QtCore/QFuture> -#include <QtCore/QtConcurrentRun> +#include <QStandardItemModel> +#include <QMessageBox> +#include <QApplication> +#include <QStyle> +#include <QIcon> + +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QDebug> +#include <QDateTime> +#include <QFuture> +#include <QtConcurrentRun> namespace VcsBase { namespace Internal { diff --git a/src/plugins/vcsbase/cleandialog.h b/src/plugins/vcsbase/cleandialog.h index db0c50af73..095675578e 100644 --- a/src/plugins/vcsbase/cleandialog.h +++ b/src/plugins/vcsbase/cleandialog.h @@ -35,7 +35,7 @@ #include "vcsbase_global.h" -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/plugins/vcsbase/command.cpp b/src/plugins/vcsbase/command.cpp index 0f4f6a89a6..343470512e 100644 --- a/src/plugins/vcsbase/command.cpp +++ b/src/plugins/vcsbase/command.cpp @@ -38,12 +38,12 @@ #include <extensionsystem/pluginmanager.h> #include <utils/synchronousprocess.h> -#include <QtCore/QDebug> -#include <QtCore/QProcess> -#include <QtCore/QFuture> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> +#include <QDebug> +#include <QProcess> +#include <QFuture> +#include <QtConcurrentRun> +#include <QFileInfo> +#include <QCoreApplication> Q_DECLARE_METATYPE(QVariant) diff --git a/src/plugins/vcsbase/command.h b/src/plugins/vcsbase/command.h index 5fc26c92b8..79705c6c96 100644 --- a/src/plugins/vcsbase/command.h +++ b/src/plugins/vcsbase/command.h @@ -35,10 +35,10 @@ #include "vcsbase_global.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtCore/QProcessEnvironment> +#include <QObject> +#include <QStringList> +#include <QVariant> +#include <QProcessEnvironment> namespace VcsBase { diff --git a/src/plugins/vcsbase/commonsettingspage.cpp b/src/plugins/vcsbase/commonsettingspage.cpp index 16617d5066..3349cbceca 100644 --- a/src/plugins/vcsbase/commonsettingspage.cpp +++ b/src/plugins/vcsbase/commonsettingspage.cpp @@ -39,9 +39,9 @@ #include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QCoreApplication> +#include <QMessageBox> namespace VcsBase { namespace Internal { diff --git a/src/plugins/vcsbase/commonsettingspage.h b/src/plugins/vcsbase/commonsettingspage.h index a04413ff61..a5a37afe96 100644 --- a/src/plugins/vcsbase/commonsettingspage.h +++ b/src/plugins/vcsbase/commonsettingspage.h @@ -37,8 +37,8 @@ #include "vcsbaseoptionspage.h" -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QPointer> +#include <QWidget> namespace VcsBase { namespace Internal { diff --git a/src/plugins/vcsbase/commonvcssettings.cpp b/src/plugins/vcsbase/commonvcssettings.cpp index 8c4cb3a7c9..6fbd90a015 100644 --- a/src/plugins/vcsbase/commonvcssettings.cpp +++ b/src/plugins/vcsbase/commonvcssettings.cpp @@ -32,8 +32,8 @@ #include "commonvcssettings.h" -#include <QtCore/QSettings> -#include <QtCore/QDebug> +#include <QSettings> +#include <QDebug> static const char settingsGroupC[] = "VCS"; static const char nickNameMailMapKeyC[] = "NickNameMailMap"; diff --git a/src/plugins/vcsbase/commonvcssettings.h b/src/plugins/vcsbase/commonvcssettings.h index f72b7f430a..4d3c6cb880 100644 --- a/src/plugins/vcsbase/commonvcssettings.h +++ b/src/plugins/vcsbase/commonvcssettings.h @@ -33,7 +33,7 @@ #ifndef COMMONVCSSETTINGS_H #define COMMONVCSSETTINGS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp index c22ba47352..4119ade372 100644 --- a/src/plugins/vcsbase/diffhighlighter.cpp +++ b/src/plugins/vcsbase/diffhighlighter.cpp @@ -36,10 +36,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QtAlgorithms> -#include <QtCore/QRegExp> -#include <QtGui/QBrush> +#include <QDebug> +#include <QtAlgorithms> +#include <QRegExp> +#include <QBrush> /*! \class VcsBase::DiffHighlighter diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp index 080cfd8120..1233b8f461 100644 --- a/src/plugins/vcsbase/nicknamedialog.cpp +++ b/src/plugins/vcsbase/nicknamedialog.cpp @@ -35,12 +35,12 @@ #include <utils/fileutils.h> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtGui/QPushButton> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> +#include <QDebug> +#include <QFile> +#include <QDir> +#include <QPushButton> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> enum { NickNameRole = Qt::UserRole + 1 }; diff --git a/src/plugins/vcsbase/nicknamedialog.h b/src/plugins/vcsbase/nicknamedialog.h index 2fa20d80d9..bfd8a42136 100644 --- a/src/plugins/vcsbase/nicknamedialog.h +++ b/src/plugins/vcsbase/nicknamedialog.h @@ -33,7 +33,7 @@ #ifndef NICKNAMEDIALOG_H #define NICKNAMEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; diff --git a/src/plugins/vcsbase/submitfilemodel.cpp b/src/plugins/vcsbase/submitfilemodel.cpp index 348e1676ce..1b3e45811c 100644 --- a/src/plugins/vcsbase/submitfilemodel.cpp +++ b/src/plugins/vcsbase/submitfilemodel.cpp @@ -35,9 +35,9 @@ #include <coreplugin/fileiconprovider.h> -#include <QtGui/QStandardItem> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QStandardItem> +#include <QFileInfo> +#include <QDebug> namespace VcsBase { diff --git a/src/plugins/vcsbase/submitfilemodel.h b/src/plugins/vcsbase/submitfilemodel.h index 12ac10c8c1..6528c93813 100644 --- a/src/plugins/vcsbase/submitfilemodel.h +++ b/src/plugins/vcsbase/submitfilemodel.h @@ -35,7 +35,7 @@ #include "vcsbase_global.h" -#include <QtGui/QStandardItemModel> +#include <QStandardItemModel> namespace VcsBase { diff --git a/src/plugins/vcsbase/vcsbase_global.h b/src/plugins/vcsbase/vcsbase_global.h index 57f34b60d8..9e684210e4 100644 --- a/src/plugins/vcsbase/vcsbase_global.h +++ b/src/plugins/vcsbase/vcsbase_global.h @@ -33,7 +33,7 @@ #ifndef VCSBASEGLOBAL_H #define VCSBASEGLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(VCSBASE_LIBRARY) # define VCSBASE_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index dd2c6a16bb..0ee01f087d 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -46,16 +46,16 @@ #include <vcsbase/vcsbaseoutputwindow.h> #include <vcsbase/vcsbaseplugin.h> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtCore/QDir> -#include <QtCore/QProcess> -#include <QtCore/QSignalMapper> -#include <QtCore/QTextCodec> -#include <QtCore/QtDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QByteArray> -#include <QtCore/QMetaType> +#include <QStringList> +#include <QSharedPointer> +#include <QDir> +#include <QProcess> +#include <QSignalMapper> +#include <QTextCodec> +#include <QtDebug> +#include <QFileInfo> +#include <QByteArray> +#include <QMetaType> /*! \class VcsBase::VcsBaseClient diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index 8cf6e1a87e..f25c0ba05c 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -35,11 +35,11 @@ #include "vcsbase_global.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtCore/QVariant> -#include <QtCore/QProcessEnvironment> +#include <QObject> +#include <QStringList> +#include <QSharedPointer> +#include <QVariant> +#include <QProcessEnvironment> QT_BEGIN_NAMESPACE class QFileInfo; diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index 83afc19266..de58a459e0 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -32,7 +32,7 @@ #include "vcsbaseclientsettings.h" -#include <QtCore/QSettings> +#include <QSettings> namespace { diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h index 31f5445989..53900f5011 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.h +++ b/src/plugins/vcsbase/vcsbaseclientsettings.h @@ -35,9 +35,9 @@ #include "vcsbase_global.h" -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtCore/QSharedDataPointer> +#include <QStringList> +#include <QVariant> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/vcsbase/vcsbaseconstants.h b/src/plugins/vcsbase/vcsbaseconstants.h index 36d2ae5324..6ea0d1f8ed 100644 --- a/src/plugins/vcsbase/vcsbaseconstants.h +++ b/src/plugins/vcsbase/vcsbaseconstants.h @@ -33,7 +33,7 @@ #ifndef VCSBASE_CONSTANTS_H #define VCSBASE_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace VcsBase { namespace Constants { diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index c3e688406d..cf24e5f99f 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -58,28 +58,28 @@ #include <extensionsystem/invoker.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtCore/QProcess> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QTextCodec> -#include <QtCore/QTextStream> -#include <QtCore/QUrl> -#include <QtGui/QTextBlock> -#include <QtGui/QDesktopServices> -#include <QtGui/QAction> -#include <QtGui/QKeyEvent> -#include <QtGui/QLayout> -#include <QtGui/QMenu> -#include <QtGui/QTextCursor> -#include <QtGui/QTextEdit> -#include <QtGui/QComboBox> -#include <QtGui/QToolBar> -#include <QtGui/QClipboard> -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QFileInfo> +#include <QFile> +#include <QProcess> +#include <QRegExp> +#include <QSet> +#include <QTextCodec> +#include <QTextStream> +#include <QUrl> +#include <QTextBlock> +#include <QDesktopServices> +#include <QAction> +#include <QKeyEvent> +#include <QLayout> +#include <QMenu> +#include <QTextCursor> +#include <QTextEdit> +#include <QComboBox> +#include <QToolBar> +#include <QClipboard> +#include <QApplication> +#include <QMessageBox> /*! \enum VcsBase::EditorContentType diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index b945b790fb..6744c57cc5 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -37,7 +37,7 @@ #include <texteditor/basetexteditor.h> -#include <QtCore/QSet> +#include <QSet> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp index b0e9c886fb..aceb6d7bd3 100644 --- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp +++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp @@ -32,11 +32,11 @@ #include "vcsbaseeditorparameterwidget.h" -#include <QtGui/QComboBox> -#include <QtGui/QToolButton> -#include <QtGui/QHBoxLayout> +#include <QComboBox> +#include <QToolButton> +#include <QHBoxLayout> -#include <QtCore/QDebug> +#include <QDebug> namespace VcsBase { diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h index 20c95b444b..d235adea09 100644 --- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h +++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h @@ -35,9 +35,9 @@ #include "vcsbase_global.h" -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtGui/QWidget> +#include <QStringList> +#include <QVariant> +#include <QWidget> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp index 392811c9df..321c86b0c0 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp +++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp @@ -34,8 +34,8 @@ #include "vcsbaseconstants.h" -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> /*! \class VcsBase::VcsBaseOptionsPage diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp index d574d28b69..cc03033bed 100644 --- a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp +++ b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp @@ -35,22 +35,22 @@ #include <utils/qtcassert.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QTextCharFormat> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QTextBlock> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlockUserData> - -#include <QtCore/QPointer> -#include <QtCore/QTextCodec> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtCore/QTime> -#include <QtCore/QPoint> -#include <QtCore/QFileInfo> +#include <QPlainTextEdit> +#include <QTextCharFormat> +#include <QContextMenuEvent> +#include <QTextBlock> +#include <QMenu> +#include <QAction> +#include <QTextDocument> +#include <QTextBlockUserData> + +#include <QPointer> +#include <QTextCodec> +#include <QDir> +#include <QTextStream> +#include <QTime> +#include <QPoint> +#include <QFileInfo> /*! \class VcsBase::VcsBaseOutputWindow diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 4d137dec8d..7d259a8d74 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -50,19 +50,19 @@ #include <utils/synchronousprocess.h> #include <utils/environment.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QSharedData> -#include <QtCore/QScopedPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QProcessEnvironment> -#include <QtCore/QTextStream> -#include <QtCore/QTextCodec> - -#include <QtGui/QAction> -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> +#include <QDebug> +#include <QDir> +#include <QSharedData> +#include <QScopedPointer> +#include <QSharedPointer> +#include <QProcessEnvironment> +#include <QTextStream> +#include <QTextCodec> + +#include <QAction> +#include <QMessageBox> +#include <QFileDialog> +#include <QMainWindow> using namespace Utils; diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index 26d014ee09..e837f0db60 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -37,8 +37,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QSharedDataPointer> -#include <QtCore/QList> +#include <QSharedDataPointer> +#include <QList> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 5b9cd1da1a..778e79a6dc 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -66,24 +66,24 @@ #include <projectexplorer/session.h> #include <projectexplorer/project.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QTemporaryFile> -#include <QtCore/QProcess> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QPointer> -#include <QtGui/QStringListModel> -#include <QtCore/QTextStream> -#include <QtGui/QStyle> -#include <QtGui/QToolBar> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QCompleter> -#include <QtGui/QLineEdit> -#include <QtGui/QTextEdit> +#include <QDebug> +#include <QDir> +#include <QTemporaryFile> +#include <QProcess> +#include <QFile> +#include <QFileInfo> +#include <QPointer> +#include <QStringListModel> +#include <QTextStream> +#include <QStyle> +#include <QToolBar> +#include <QAction> +#include <QApplication> +#include <QMessageBox> +#include <QMainWindow> +#include <QCompleter> +#include <QLineEdit> +#include <QTextEdit> #include <cstring> enum { debug = 0 }; diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h index 38d13f25e8..712d709813 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.h +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h @@ -37,7 +37,7 @@ #include <coreplugin/editormanager/ieditor.h> -#include <QtGui/QAbstractItemView> +#include <QAbstractItemView> QT_BEGIN_NAMESPACE class QIcon; diff --git a/src/plugins/vcsbase/vcsconfigurationpage.h b/src/plugins/vcsbase/vcsconfigurationpage.h index c97249ad29..9a6ef8e35f 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.h +++ b/src/plugins/vcsbase/vcsconfigurationpage.h @@ -35,7 +35,7 @@ #include "vcsbase_global.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Core { class IVersionControl; } diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp index 54c2ee9ac9..f518994bf2 100644 --- a/src/plugins/vcsbase/vcsplugin.cpp +++ b/src/plugins/vcsbase/vcsplugin.cpp @@ -42,8 +42,8 @@ #include <coreplugin/id.h> #include <coreplugin/mimedatabase.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> +#include <QtPlugin> +#include <QDebug> namespace VcsBase { namespace Internal { diff --git a/src/plugins/vcsbase/vcsplugin.h b/src/plugins/vcsbase/vcsplugin.h index 1cee5ca224..0147ece563 100644 --- a/src/plugins/vcsbase/vcsplugin.h +++ b/src/plugins/vcsbase/vcsplugin.h @@ -35,7 +35,7 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/welcome/welcome_global.h b/src/plugins/welcome/welcome_global.h index 89e3b89c9c..bf26dd3275 100644 --- a/src/plugins/welcome/welcome_global.h +++ b/src/plugins/welcome/welcome_global.h @@ -33,7 +33,7 @@ #ifndef WELCOME_GLOBAL_H #define WELCOME_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(WELCOME_LIBRARY) # define WELCOME_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 0f91f71fe7..7dd6261076 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -47,22 +47,22 @@ #include <utils/iwelcomepage.h> #include <utils/networkaccessmanager.h> -#include <QtGui/QScrollArea> -#include <QtGui/QDesktopServices> -#include <QtGui/QPainter> -#include <QtGui/QHBoxLayout> - -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QSettings> -#include <QtCore/QDebug> -#include <QtCore/QUrl> -#include <QtCore/QtPlugin> - -#include <QtDeclarative/QDeclarativeView> -#include <QtDeclarative/QDeclarativeContext> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory> +#include <QScrollArea> +#include <QDesktopServices> +#include <QPainter> +#include <QHBoxLayout> + +#include <QCoreApplication> +#include <QDir> +#include <QSettings> +#include <QDebug> +#include <QUrl> +#include <QtPlugin> + +#include <QDeclarativeView> +#include <QDeclarativeContext> +#include <QDeclarativeEngine> +#include <QDeclarativeNetworkAccessManagerFactory> enum { debug = 0 }; diff --git a/src/shared/cpaster/cgi.cpp b/src/shared/cpaster/cgi.cpp index bc9d73bcc7..c92a92a526 100644 --- a/src/shared/cpaster/cgi.cpp +++ b/src/shared/cpaster/cgi.cpp @@ -32,7 +32,7 @@ #include "cgi.h" -#include <QtCore/QByteArray> +#include <QByteArray> const char cgi_chars[] = "0123456789abcdef"; // RFC 1738 suggests lower-case to be optimal diff --git a/src/shared/cpaster/cgi.h b/src/shared/cpaster/cgi.h index 37a92b9609..b73ebda71f 100644 --- a/src/shared/cpaster/cgi.h +++ b/src/shared/cpaster/cgi.h @@ -33,7 +33,7 @@ #ifndef CGI_H #define CGI_H -#include <QtCore/QString> +#include <QString> class CGI { diff --git a/src/shared/cpaster/splitter.cpp b/src/shared/cpaster/splitter.cpp index 8bb08718a4..4d4b2f96f8 100644 --- a/src/shared/cpaster/splitter.cpp +++ b/src/shared/cpaster/splitter.cpp @@ -32,7 +32,7 @@ #include "splitter.h" -#include <QtCore/QRegExp> +#include <QRegExp> FileDataList splitDiffToFiles(const QString &strData) { diff --git a/src/shared/cpaster/splitter.h b/src/shared/cpaster/splitter.h index 4f332b2301..23c42df6ff 100644 --- a/src/shared/cpaster/splitter.h +++ b/src/shared/cpaster/splitter.h @@ -33,9 +33,9 @@ #ifndef SPLITTER_H #define SPLITTER_H -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QByteArray> +#include <QList> +#include <QString> struct FileData { diff --git a/src/shared/designerintegrationv2/formresizer.cpp b/src/shared/designerintegrationv2/formresizer.cpp index 6108cce499..958dcc9735 100644 --- a/src/shared/designerintegrationv2/formresizer.cpp +++ b/src/shared/designerintegrationv2/formresizer.cpp @@ -34,14 +34,14 @@ #include "sizehandlerect.h" #include "widgethostconstants.h" -#include <QtCore/QDebug> +#include <QDebug> -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QDesignerFormWindowInterface> -#include <QtGui/QResizeEvent> -#include <QtGui/QPalette> -#include <QtGui/QLayout> -#include <QtGui/QFrame> +#include <QResizeEvent> +#include <QPalette> +#include <QLayout> +#include <QFrame> enum { debugFormResizer = 0 }; diff --git a/src/shared/designerintegrationv2/formresizer.h b/src/shared/designerintegrationv2/formresizer.h index 16211dc940..93e62f2d23 100644 --- a/src/shared/designerintegrationv2/formresizer.h +++ b/src/shared/designerintegrationv2/formresizer.h @@ -34,8 +34,8 @@ #include "widgethostconstants.h" -#include <QtGui/QWidget> -#include <QtCore/QVector> +#include <QWidget> +#include <QVector> QT_FORWARD_DECLARE_CLASS(QDesignerFormWindowInterface) QT_FORWARD_DECLARE_CLASS(QFrame) diff --git a/src/shared/designerintegrationv2/sizehandlerect.cpp b/src/shared/designerintegrationv2/sizehandlerect.cpp index d9a2737d3f..8692cf64db 100644 --- a/src/shared/designerintegrationv2/sizehandlerect.cpp +++ b/src/shared/designerintegrationv2/sizehandlerect.cpp @@ -32,12 +32,12 @@ #include "sizehandlerect.h" #include "widgethostconstants.h" -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QDesignerFormWindowInterface> -#include <QtGui/QMouseEvent> -#include <QtGui/QPainter> -#include <QtGui/QFrame> -#include <QtCore/QDebug> +#include <QMouseEvent> +#include <QPainter> +#include <QFrame> +#include <QDebug> enum { debugSizeHandle = 0 }; diff --git a/src/shared/designerintegrationv2/sizehandlerect.h b/src/shared/designerintegrationv2/sizehandlerect.h index 652a41b968..021a8ee9ed 100644 --- a/src/shared/designerintegrationv2/sizehandlerect.h +++ b/src/shared/designerintegrationv2/sizehandlerect.h @@ -34,8 +34,8 @@ #include "widgethostconstants.h" -#include <QtGui/QWidget> -#include <QtCore/QPoint> +#include <QWidget> +#include <QPoint> namespace SharedTools { namespace Internal { diff --git a/src/shared/designerintegrationv2/widgethost.cpp b/src/shared/designerintegrationv2/widgethost.cpp index 2c8fad031b..65aa26c935 100644 --- a/src/shared/designerintegrationv2/widgethost.cpp +++ b/src/shared/designerintegrationv2/widgethost.cpp @@ -34,14 +34,14 @@ #include "formresizer.h" #include "widgethostconstants.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowCursorInterface> +#include <QDesignerFormWindowInterface> +#include <QDesignerFormWindowCursorInterface> -#include <QtGui/QPalette> -#include <QtGui/QLayout> -#include <QtGui/QFrame> -#include <QtGui/QResizeEvent> -#include <QtCore/QDebug> +#include <QPalette> +#include <QLayout> +#include <QFrame> +#include <QResizeEvent> +#include <QDebug> using namespace SharedTools; diff --git a/src/shared/designerintegrationv2/widgethost.h b/src/shared/designerintegrationv2/widgethost.h index 10bf73ad93..350ff3a9ce 100644 --- a/src/shared/designerintegrationv2/widgethost.h +++ b/src/shared/designerintegrationv2/widgethost.h @@ -33,7 +33,7 @@ #ifndef WIDGETHOST_H #define WIDGETHOST_H -#include <QtGui/QScrollArea> +#include <QScrollArea> QT_FORWARD_DECLARE_CLASS(QDesignerFormWindowInterface) diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 78d8c47f0f..48d41cdd2f 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -39,24 +39,24 @@ #include <utils/filterlineedit.h> #include <utils/styledbar.h> -#include <QtGui/QMenu> -#include <QtGui/QIcon> -#include <QtGui/QStyle> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtCore/QEvent> -#include <QtGui/QComboBox> -#include <QtGui/QKeyEvent> -#include <QtGui/QLineEdit> -#include <QtGui/QMessageBox> -#include <QtGui/QHeaderView> -#include <QtGui/QToolButton> -#include <QtGui/QPushButton> -#include <QtGui/QApplication> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QSortFilterProxyModel> - -#include <QtHelp/QHelpEngine> +#include <QMenu> +#include <QIcon> +#include <QStyle> +#include <QLabel> +#include <QLayout> +#include <QEvent> +#include <QComboBox> +#include <QKeyEvent> +#include <QLineEdit> +#include <QMessageBox> +#include <QHeaderView> +#include <QToolButton> +#include <QPushButton> +#include <QApplication> +#include <QDialogButtonBox> +#include <QSortFilterProxyModel> + +#include <QHelpEngine> using namespace Help::Internal; diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h index 8ea052bb0e..98b22d3b6a 100644 --- a/src/shared/help/bookmarkmanager.h +++ b/src/shared/help/bookmarkmanager.h @@ -35,17 +35,17 @@ #include "ui_bookmarkdialog.h" -#include <QtCore/QUrl> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QByteArray> -#include <QtCore/QDataStream> - -#include <QtGui/QIcon> -#include <QtGui/QDialog> -#include <QtGui/QWidget> -#include <QtGui/QTreeView> -#include <QtGui/QStandardItemModel> +#include <QUrl> +#include <QObject> +#include <QString> +#include <QByteArray> +#include <QDataStream> + +#include <QIcon> +#include <QDialog> +#include <QWidget> +#include <QTreeView> +#include <QStandardItemModel> QT_BEGIN_NAMESPACE diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp index 735aeaa388..c88713cf65 100644 --- a/src/shared/help/contentwindow.cpp +++ b/src/shared/help/contentwindow.cpp @@ -37,12 +37,12 @@ #include "localhelpmanager.h" #include "openpagesmanager.h" -#include <QtGui/QLayout> -#include <QtGui/QFocusEvent> -#include <QtGui/QMenu> +#include <QLayout> +#include <QFocusEvent> +#include <QMenu> -#include <QtHelp/QHelpEngine> -#include <QtHelp/QHelpContentWidget> +#include <QHelpEngine> +#include <QHelpContentWidget> using namespace Help::Internal; diff --git a/src/shared/help/contentwindow.h b/src/shared/help/contentwindow.h index e9d3980310..6ec4c115ac 100644 --- a/src/shared/help/contentwindow.h +++ b/src/shared/help/contentwindow.h @@ -33,9 +33,9 @@ #ifndef CONTENTWINDOW_H #define CONTENTWINDOW_H -#include <QtCore/QUrl> -#include <QtCore/QModelIndex> -#include <QtGui/QWidget> +#include <QUrl> +#include <QModelIndex> +#include <QWidget> QT_BEGIN_NAMESPACE diff --git a/src/shared/help/filternamedialog.cpp b/src/shared/help/filternamedialog.cpp index a8e572d44c..9e5ac1b0ca 100644 --- a/src/shared/help/filternamedialog.cpp +++ b/src/shared/help/filternamedialog.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtGui/QPushButton> +#include <QPushButton> #include "filternamedialog.h" diff --git a/src/shared/help/filternamedialog.h b/src/shared/help/filternamedialog.h index c8bdc290a4..6736a52ce1 100644 --- a/src/shared/help/filternamedialog.h +++ b/src/shared/help/filternamedialog.h @@ -33,7 +33,7 @@ #ifndef FILTERNAMEDIALOG_H #define FILTERNAMEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> #include "ui_filternamedialog.h" class FilterNameDialog : public QDialog diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp index da06268e1b..d888c3e8db 100644 --- a/src/shared/help/indexwindow.cpp +++ b/src/shared/help/indexwindow.cpp @@ -41,16 +41,16 @@ #include <utils/filterlineedit.h> #include <utils/styledbar.h> -#include <QtGui/QLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QListWidgetItem> - -#include <QtHelp/QHelpEngine> -#include <QtHelp/QHelpIndexWidget> +#include <QLayout> +#include <QLabel> +#include <QLineEdit> +#include <QKeyEvent> +#include <QMenu> +#include <QContextMenuEvent> +#include <QListWidgetItem> + +#include <QHelpEngine> +#include <QHelpIndexWidget> using namespace Help::Internal; diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h index 55b84c1ffd..6da8f51838 100644 --- a/src/shared/help/indexwindow.h +++ b/src/shared/help/indexwindow.h @@ -33,9 +33,9 @@ #ifndef INDEXWINDOW_H #define INDEXWINDOW_H -#include <QtCore/QUrl> -#include <QtGui/QWidget> -#include <QtGui/QLineEdit> +#include <QUrl> +#include <QWidget> +#include <QLineEdit> QT_BEGIN_NAMESPACE diff --git a/src/shared/help/topicchooser.cpp b/src/shared/help/topicchooser.cpp index 79bd892e88..9a101fa504 100644 --- a/src/shared/help/topicchooser.cpp +++ b/src/shared/help/topicchooser.cpp @@ -32,12 +32,12 @@ #include "topicchooser.h" -#include <QtCore/QMap> -#include <QtCore/QUrl> +#include <QMap> +#include <QUrl> -#include <QtGui/QKeyEvent> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> +#include <QKeyEvent> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> TopicChooser::TopicChooser(QWidget *parent, const QString &keyword, const QMap<QString, QUrl> &links) diff --git a/src/shared/help/topicchooser.h b/src/shared/help/topicchooser.h index 39f98face2..2cc29aa790 100644 --- a/src/shared/help/topicchooser.h +++ b/src/shared/help/topicchooser.h @@ -35,12 +35,12 @@ #include "ui_topicchooser.h" -#include <QtCore/QUrl> -#include <QtCore/QMap> -#include <QtCore/QModelIndex> -#include <QtCore/QString> +#include <QUrl> +#include <QMap> +#include <QModelIndex> +#include <QString> -#include <QtGui/QDialog> +#include <QDialog> QT_FORWARD_DECLARE_CLASS(QSortFilterProxyModel) diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index bc653af694..32969ea0e2 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -36,11 +36,11 @@ #include <utils/qtcassert.h> #endif // TODO_USE_CREATOR -#include <QtCore/QByteArray> -#include <QtCore/QTextStream> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QByteArray> +#include <QTextStream> +#include <QDebug> +#include <QStringList> +#include <QVariant> #include <ctype.h> diff --git a/src/shared/json/json.h b/src/shared/json/json.h index 0470799d0a..b518b879fc 100644 --- a/src/shared/json/json.h +++ b/src/shared/json/json.h @@ -35,9 +35,9 @@ #include "json_global.h" -#include <QtCore/QByteArray> -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QByteArray> +#include <QStringList> +#include <QVector> namespace Json { diff --git a/src/shared/json/json_global.h b/src/shared/json/json_global.h index 804422c6a9..cdd5b01a96 100644 --- a/src/shared/json/json_global.h +++ b/src/shared/json/json_global.h @@ -33,7 +33,7 @@ #ifndef JSON_GLOBAL_H #define JSON_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(JSON_BUILD_LIB) # define JSON_EXPORT Q_DECL_EXPORT diff --git a/src/shared/modeltest/modeltest.h b/src/shared/modeltest/modeltest.h index 32aba9a62c..b59c8cac48 100644 --- a/src/shared/modeltest/modeltest.h +++ b/src/shared/modeltest/modeltest.h @@ -33,9 +33,9 @@ #ifndef MODELTEST_H #define MODELTEST_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QObject> -#include <QtCore/QStack> +#include <QAbstractItemModel> +#include <QObject> +#include <QStack> class ModelTest : public QObject { diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp index b1c24c2046..eaaf18e698 100644 --- a/src/shared/proparser/ioutils.cpp +++ b/src/shared/proparser/ioutils.cpp @@ -32,8 +32,8 @@ #include "ioutils.h" -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QDir> +#include <QFile> #ifdef Q_OS_WIN # include <windows.h> diff --git a/src/shared/proparser/ioutils.h b/src/shared/proparser/ioutils.h index c00fbda4f9..b3f98ba53b 100644 --- a/src/shared/proparser/ioutils.h +++ b/src/shared/proparser/ioutils.h @@ -33,7 +33,7 @@ #ifndef IOUTILS_H #define IOUTILS_H -#include <QtCore/QString> +#include <QString> QT_USE_NAMESPACE diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 511b73d645..078f6aadba 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -35,21 +35,21 @@ #include "profileparser.h" #include "ioutils.h" -#include <QtCore/QByteArray> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QList> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QStack> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> +#include <QByteArray> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QList> +#include <QRegExp> +#include <QSet> +#include <QStack> +#include <QString> +#include <QStringList> +#include <QTextStream> #ifdef PROEVALUATOR_THREAD_SAFE -# include <QtCore/QThreadPool> +# include <QThreadPool> #endif #ifdef Q_OS_UNIX diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index 98f426ae9d..8866efb810 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -36,14 +36,14 @@ #include "proparser_global.h" #include "proitems.h" -#include <QtCore/QHash> -#include <QtCore/QStringList> +#include <QHash> +#include <QStringList> #ifndef QT_BOOTSTRAPPED -# include <QtCore/QProcess> +# include <QProcess> #endif #ifdef PROEVALUATOR_THREAD_SAFE -# include <QtCore/QMutex> -# include <QtCore/QWaitCondition> +# include <QMutex> +# include <QWaitCondition> #endif QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/profileparser.cpp b/src/shared/proparser/profileparser.cpp index 1b99380201..c1aae00d7e 100644 --- a/src/shared/proparser/profileparser.cpp +++ b/src/shared/proparser/profileparser.cpp @@ -35,9 +35,9 @@ #include "ioutils.h" using namespace ProFileEvaluatorInternal; -#include <QtCore/QFile> +#include <QFile> #ifdef PROPARSER_THREAD_SAFE -# include <QtCore/QThreadPool> +# include <QThreadPool> #endif QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/profileparser.h b/src/shared/proparser/profileparser.h index cd5f1da07c..fbea7e2e87 100644 --- a/src/shared/proparser/profileparser.h +++ b/src/shared/proparser/profileparser.h @@ -35,11 +35,11 @@ #include "proparser_global.h" #include "proitems.h" -#include <QtCore/QHash> -#include <QtCore/QStack> +#include <QHash> +#include <QStack> #ifdef PROPARSER_THREAD_SAFE -# include <QtCore/QMutex> -# include <QtCore/QWaitCondition> +# include <QMutex> +# include <QWaitCondition> #endif // Be fast even for debug builds diff --git a/src/shared/proparser/proitems.cpp b/src/shared/proparser/proitems.cpp index e324bb5569..3502bd761a 100644 --- a/src/shared/proparser/proitems.cpp +++ b/src/shared/proparser/proitems.cpp @@ -32,8 +32,8 @@ #include "proitems.h" -#include <QtCore/QFileInfo> -#include <QtCore/QSet> +#include <QFileInfo> +#include <QSet> QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h index b599f66638..63ead684d0 100644 --- a/src/shared/proparser/proitems.h +++ b/src/shared/proparser/proitems.h @@ -34,8 +34,8 @@ #define PROITEMS_H #include "proparser_global.h" -#include <QtCore/QString> -#include <QtCore/QVector> +#include <QString> +#include <QVector> QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/proparser_global.h b/src/shared/proparser/proparser_global.h index e3c52175e8..ac639bbd98 100644 --- a/src/shared/proparser/proparser_global.h +++ b/src/shared/proparser/proparser_global.h @@ -33,7 +33,7 @@ #ifndef PROPARSER_GLOBAL_H #define PROPARSER_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(PROPARSER_AS_LIBRARY) # if defined(PROPARSER_LIBRARY) diff --git a/src/shared/proparser/prowriter.cpp b/src/shared/proparser/prowriter.cpp index 4bf1b76e33..984f60683f 100644 --- a/src/shared/proparser/prowriter.cpp +++ b/src/shared/proparser/prowriter.cpp @@ -33,8 +33,8 @@ #include "proitems.h" #include "prowriter.h" -#include <QtCore/QDir> -#include <QtCore/QPair> +#include <QDir> +#include <QPair> using namespace Qt4ProjectManager::Internal; diff --git a/src/shared/proparser/prowriter.h b/src/shared/proparser/prowriter.h index b7e0135e32..7608529ba7 100644 --- a/src/shared/proparser/prowriter.h +++ b/src/shared/proparser/prowriter.h @@ -34,7 +34,7 @@ #define PROWRITER_H #include "proparser_global.h" -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QDir; diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/shared/qrceditor/qrceditor.cpp index f8af0c85b5..0896574e28 100644 --- a/src/shared/qrceditor/qrceditor.cpp +++ b/src/shared/qrceditor/qrceditor.cpp @@ -33,11 +33,11 @@ #include "qrceditor.h" #include "undocommands_p.h" -#include <QtCore/QDebug> -#include <QtCore/QScopedPointer> -#include <QtGui/QMenu> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QScopedPointer> +#include <QMenu> +#include <QFileDialog> +#include <QMessageBox> using namespace SharedTools; diff --git a/src/shared/qrceditor/qrceditor.h b/src/shared/qrceditor/qrceditor.h index 8bada5560c..1804a388db 100644 --- a/src/shared/qrceditor/qrceditor.h +++ b/src/shared/qrceditor/qrceditor.h @@ -35,8 +35,8 @@ #include "ui_qrceditor.h" #include "resourceview.h" -#include <QtGui/QWidget> -#include <QtGui/QUndoStack> +#include <QWidget> +#include <QUndoStack> namespace SharedTools { diff --git a/src/shared/qrceditor/resourcefile.cpp b/src/shared/qrceditor/resourcefile.cpp index 2caf203d6d..3d67e1f2d4 100644 --- a/src/shared/qrceditor/resourcefile.cpp +++ b/src/shared/qrceditor/resourcefile.cpp @@ -32,18 +32,18 @@ #include "resourcefile_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QMimeData> -#include <QtCore/QtAlgorithms> -#include <QtCore/QTextStream> - -#include <QtGui/QIcon> -#include <QtGui/QImageReader> - -#include <QtXml/QDomDocument> +#include <QCoreApplication> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QMimeData> +#include <QtAlgorithms> +#include <QTextStream> + +#include <QIcon> +#include <QImageReader> + +#include <QDomDocument> QT_BEGIN_NAMESPACE diff --git a/src/shared/qrceditor/resourcefile_p.h b/src/shared/qrceditor/resourcefile_p.h index e4fc4cff71..10956cd086 100644 --- a/src/shared/qrceditor/resourcefile_p.h +++ b/src/shared/qrceditor/resourcefile_p.h @@ -33,11 +33,11 @@ #ifndef RESOURCEFILE_P_H #define RESOURCEFILE_P_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtGui/QIcon> +#include <QAbstractItemModel> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QIcon> QT_BEGIN_NAMESPACE diff --git a/src/shared/qrceditor/resourceview.cpp b/src/shared/qrceditor/resourceview.cpp index 60dffc01d2..7590af1abe 100644 --- a/src/shared/qrceditor/resourceview.cpp +++ b/src/shared/qrceditor/resourceview.cpp @@ -34,16 +34,16 @@ #include "undocommands_p.h" -#include <QtCore/QDebug> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QFileDialog> -#include <QtGui/QHeaderView> -#include <QtGui/QInputDialog> -#include <QtGui/QMenu> -#include <QtGui/QMouseEvent> -#include <QtGui/QUndoStack> +#include <QDebug> + +#include <QAction> +#include <QApplication> +#include <QFileDialog> +#include <QHeaderView> +#include <QInputDialog> +#include <QMenu> +#include <QMouseEvent> +#include <QUndoStack> namespace SharedTools { diff --git a/src/shared/qrceditor/resourceview.h b/src/shared/qrceditor/resourceview.h index 10201d866a..5cda89c904 100644 --- a/src/shared/qrceditor/resourceview.h +++ b/src/shared/qrceditor/resourceview.h @@ -35,8 +35,8 @@ #include "resourcefile_p.h" -#include <QtGui/QTreeView> -#include <QtCore/QPoint> +#include <QTreeView> +#include <QPoint> using namespace qdesigner_internal; diff --git a/src/shared/qrceditor/undocommands.cpp b/src/shared/qrceditor/undocommands.cpp index 3e5fd2566d..c08a60f7a7 100644 --- a/src/shared/qrceditor/undocommands.cpp +++ b/src/shared/qrceditor/undocommands.cpp @@ -32,7 +32,7 @@ #include "undocommands_p.h" -#include <QtCore/QModelIndex> +#include <QModelIndex> namespace SharedTools { diff --git a/src/shared/qrceditor/undocommands_p.h b/src/shared/qrceditor/undocommands_p.h index 8210005cc0..8363211a32 100644 --- a/src/shared/qrceditor/undocommands_p.h +++ b/src/shared/qrceditor/undocommands_p.h @@ -35,8 +35,8 @@ #include "resourceview.h" -#include <QtCore/QString> -#include <QtGui/QUndoCommand> +#include <QString> +#include <QUndoCommand> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/shared/qtcreator_gui_pch.h b/src/shared/qtcreator_gui_pch.h index 0d47d24ebb..7f938a68ad 100644 --- a/src/shared/qtcreator_gui_pch.h +++ b/src/shared/qtcreator_gui_pch.h @@ -39,17 +39,17 @@ #if defined __cplusplus -#include <QtCore/QEvent> -#include <QtCore/QTimer> -#include <QtGui/QApplication> -#include <QtGui/QBitmap> -#include <QtGui/QCursor> -#include <QtGui/QDesktopWidget> -#include <QtGui/QImage> -#include <QtGui/QLayout> -#include <QtGui/QPainter> -#include <QtGui/QPixmap> -#include <QtGui/QStyle> -#include <QtGui/QWidget> +#include <QEvent> +#include <QTimer> +#include <QApplication> +#include <QBitmap> +#include <QCursor> +#include <QDesktopWidget> +#include <QImage> +#include <QLayout> +#include <QPainter> +#include <QPixmap> +#include <QStyle> +#include <QWidget> #endif diff --git a/src/shared/qtcreator_pch.h b/src/shared/qtcreator_pch.h index c8bb96a5dc..d210804eb7 100644 --- a/src/shared/qtcreator_pch.h +++ b/src/shared/qtcreator_pch.h @@ -36,7 +36,7 @@ */ #if defined __cplusplus -#include <QtCore/QtGlobal> +#include <QtGlobal> #ifdef Q_WS_WIN # define _POSIX_ @@ -44,18 +44,18 @@ # undef _POSIX_ #endif -#include <QtCore/QCoreApplication> -#include <QtCore/QList> -#include <QtCore/QVariant> -#include <QtCore/QObject> -#include <QtCore/QRegExp> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QTextCodec> -#include <QtCore/QPointer> -#include <QtCore/QScopedPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QList> +#include <QVariant> +#include <QObject> +#include <QRegExp> +#include <QString> +#include <QStringList> +#include <QTextCodec> +#include <QPointer> +#include <QScopedPointer> +#include <QSharedPointer> +#include <QDebug> #include <stdlib.h> #endif diff --git a/src/shared/qtlockedfile/qtlockedfile.h b/src/shared/qtlockedfile/qtlockedfile.h index 286d2544a5..e803850898 100644 --- a/src/shared/qtlockedfile/qtlockedfile.h +++ b/src/shared/qtlockedfile/qtlockedfile.h @@ -33,7 +33,7 @@ #ifndef QTLOCKEDFILE_H #define QTLOCKEDFILE_H -#include <QtCore/QFile> +#include <QFile> #if defined(Q_OS_WIN) # if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT) diff --git a/src/shared/qtlockedfile/qtlockedfile_win.cpp b/src/shared/qtlockedfile/qtlockedfile_win.cpp index 50eeaf6b39..6f237be0bb 100644 --- a/src/shared/qtlockedfile/qtlockedfile_win.cpp +++ b/src/shared/qtlockedfile/qtlockedfile_win.cpp @@ -33,7 +33,7 @@ #include "qtlockedfile.h" #include <qt_windows.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> namespace SharedTools { diff --git a/src/shared/qtsingleapplication/qtlocalpeer.cpp b/src/shared/qtsingleapplication/qtlocalpeer.cpp index ea034f3fe2..1b1619aafd 100644 --- a/src/shared/qtsingleapplication/qtlocalpeer.cpp +++ b/src/shared/qtsingleapplication/qtlocalpeer.cpp @@ -32,12 +32,12 @@ #include "qtlocalpeer.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QTime> +#include <QCoreApplication> +#include <QTime> #if defined(Q_OS_WIN) -#include <QtCore/QLibrary> -#include <QtCore/qt_windows.h> +#include <QLibrary> +#include <qt_windows.h> typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); static PProcessIdToSessionId pProcessIdToSessionId = 0; #endif diff --git a/src/shared/qtsingleapplication/qtlocalpeer.h b/src/shared/qtsingleapplication/qtlocalpeer.h index 628f5f462b..7a56e013c1 100644 --- a/src/shared/qtsingleapplication/qtlocalpeer.h +++ b/src/shared/qtsingleapplication/qtlocalpeer.h @@ -32,9 +32,9 @@ #include "qtlockedfile.h" -#include <QtNetwork/QLocalServer> -#include <QtNetwork/QLocalSocket> -#include <QtCore/QDir> +#include <QLocalServer> +#include <QLocalSocket> +#include <QDir> namespace SharedTools { diff --git a/src/shared/qtsingleapplication/qtsingleapplication.cpp b/src/shared/qtsingleapplication/qtsingleapplication.cpp index 44d4542a99..ab669720e4 100644 --- a/src/shared/qtsingleapplication/qtsingleapplication.cpp +++ b/src/shared/qtsingleapplication/qtsingleapplication.cpp @@ -33,8 +33,8 @@ #include "qtsingleapplication.h" #include "qtlocalpeer.h" -#include <QtGui/QWidget> -#include <QtGui/QFileOpenEvent> +#include <QWidget> +#include <QFileOpenEvent> namespace SharedTools { diff --git a/src/shared/qtsingleapplication/qtsingleapplication.h b/src/shared/qtsingleapplication/qtsingleapplication.h index 9b44626916..02db811b14 100644 --- a/src/shared/qtsingleapplication/qtsingleapplication.h +++ b/src/shared/qtsingleapplication/qtsingleapplication.h @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> namespace SharedTools { diff --git a/src/shared/qtsingleapplication/qtsinglecoreapplication.h b/src/shared/qtsingleapplication/qtsinglecoreapplication.h index 15728fd687..98f6cc3fd5 100644 --- a/src/shared/qtsingleapplication/qtsinglecoreapplication.h +++ b/src/shared/qtsingleapplication/qtsinglecoreapplication.h @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace SharedTools { diff --git a/src/shared/registryaccess/registryaccess.cpp b/src/shared/registryaccess/registryaccess.cpp index 60b57cc73b..4d1ffbe76c 100644 --- a/src/shared/registryaccess/registryaccess.cpp +++ b/src/shared/registryaccess/registryaccess.cpp @@ -32,10 +32,10 @@ #include "registryaccess.h" -#include <QtGui/QApplication> +#include <QApplication> -#include <QtCore/QDir> -#include <QtCore/QTextStream> +#include <QDir> +#include <QTextStream> namespace RegistryAccess { diff --git a/src/shared/registryaccess/registryaccess.h b/src/shared/registryaccess/registryaccess.h index 5c7d98b197..8004005912 100644 --- a/src/shared/registryaccess/registryaccess.h +++ b/src/shared/registryaccess/registryaccess.h @@ -37,8 +37,8 @@ #ifndef REGISTRYACCESS_H #define REGISTRYACCESS_H -#include <QtCore/QString> -#include <QtCore/QLatin1String> +#include <QString> +#include <QLatin1String> #include <Windows.h> diff --git a/src/shared/scriptwrapper/interface_wrap_helpers.h b/src/shared/scriptwrapper/interface_wrap_helpers.h index 945d7ad392..7d71393269 100644 --- a/src/shared/scriptwrapper/interface_wrap_helpers.h +++ b/src/shared/scriptwrapper/interface_wrap_helpers.h @@ -33,7 +33,7 @@ #ifndef INTERFACE_WRAP_HELPERS_H #define INTERFACE_WRAP_HELPERS_H -#include <QtScript/QScriptEngine> +#include <QScriptEngine> namespace SharedTools { diff --git a/src/shared/scriptwrapper/wrap_helpers.h b/src/shared/scriptwrapper/wrap_helpers.h index 9049824f72..79dc7751d4 100644 --- a/src/shared/scriptwrapper/wrap_helpers.h +++ b/src/shared/scriptwrapper/wrap_helpers.h @@ -33,9 +33,9 @@ #ifndef WRAP_HELPERS_H #define WRAP_HELPERS_H -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptContext> -#include <QtScript/QScriptValue> +#include <QScriptEngine> +#include <QScriptContext> +#include <QScriptValue> namespace SharedTools { diff --git a/src/shared/symbianutils/codadevice.cpp b/src/shared/symbianutils/codadevice.cpp index 748b57bae7..7775e4fb09 100644 --- a/src/shared/symbianutils/codadevice.cpp +++ b/src/shared/symbianutils/codadevice.cpp @@ -34,13 +34,13 @@ #include "json.h" #include "codautils.h" -#include <QtNetwork/QAbstractSocket> -#include <QtCore/QDebug> -#include <QtCore/QVector> -#include <QtCore/QQueue> -#include <QtCore/QTextStream> -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> +#include <QAbstractSocket> +#include <QDebug> +#include <QVector> +#include <QQueue> +#include <QTextStream> +#include <QDateTime> +#include <QFileInfo> enum { debug = 0 }; diff --git a/src/shared/symbianutils/codadevice.h b/src/shared/symbianutils/codadevice.h index 5f01d6aa30..de61bfa40d 100644 --- a/src/shared/symbianutils/codadevice.h +++ b/src/shared/symbianutils/codadevice.h @@ -38,12 +38,12 @@ #include "callback.h" #include "json.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QVector> -#include <QtCore/QVariant> -#include <QtCore/QStringList> -#include <QtCore/QDateTime> +#include <QObject> +#include <QSharedPointer> +#include <QVector> +#include <QVariant> +#include <QStringList> +#include <QDateTime> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/shared/symbianutils/codamessage.cpp b/src/shared/symbianutils/codamessage.cpp index fe12fae853..dbaffaa982 100644 --- a/src/shared/symbianutils/codamessage.cpp +++ b/src/shared/symbianutils/codamessage.cpp @@ -33,8 +33,8 @@ #include "codamessage.h" #include "json.h" -#include <QtCore/QString> -#include <QtCore/QTextStream> +#include <QString> +#include <QTextStream> // Names matching the enum static const char *serviceNamesC[] = diff --git a/src/shared/symbianutils/codamessage.h b/src/shared/symbianutils/codamessage.h index bec936d46e..7585affef1 100644 --- a/src/shared/symbianutils/codamessage.h +++ b/src/shared/symbianutils/codamessage.h @@ -36,8 +36,8 @@ #include "symbianutils_global.h" #include "json_global.h" -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QStringList> +#include <QVector> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/shared/symbianutils/codautils.cpp b/src/shared/symbianutils/codautils.cpp index 54b7b0496e..d3ab91a710 100644 --- a/src/shared/symbianutils/codautils.cpp +++ b/src/shared/symbianutils/codautils.cpp @@ -33,11 +33,11 @@ #include "codautils.h" #include <ctype.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QDate> -#include <QtCore/QDateTime> -#include <QtCore/QTime> +#include <QCoreApplication> +#include <QDebug> +#include <QDate> +#include <QDateTime> +#include <QTime> #define logMessage(s) do { qDebug() << "CODACLIENT: " << s; } while (0) diff --git a/src/shared/symbianutils/codautils.h b/src/shared/symbianutils/codautils.h index 2626df17ec..8480b99d00 100644 --- a/src/shared/symbianutils/codautils.h +++ b/src/shared/symbianutils/codautils.h @@ -35,10 +35,10 @@ #include "symbianutils_global.h" -#include <QtCore/QByteArray> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QByteArray> +#include <QHash> +#include <QStringList> +#include <QVariant> QT_BEGIN_NAMESPACE class QDateTime; diff --git a/src/shared/symbianutils/symbiandevicemanager.cpp b/src/shared/symbianutils/symbiandevicemanager.cpp index d056d4cdd8..c25ffdeaa0 100644 --- a/src/shared/symbianutils/symbiandevicemanager.cpp +++ b/src/shared/symbianutils/symbiandevicemanager.cpp @@ -34,19 +34,19 @@ #include "codadevice.h" #include "virtualserialdevice.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QEvent> -#include <QtCore/QSettings> -#include <QtCore/QStringList> -#include <QtCore/QFileInfo> -#include <QtCore/QtDebug> -#include <QtCore/QTextStream> -#include <QtCore/QSharedData> -#include <QtCore/QScopedPointer> -#include <QtCore/QSignalMapper> -#include <QtCore/QThread> -#include <QtCore/QWaitCondition> -#include <QtCore/QTimer> +#include <QCoreApplication> +#include <QEvent> +#include <QSettings> +#include <QStringList> +#include <QFileInfo> +#include <QtDebug> +#include <QTextStream> +#include <QSharedData> +#include <QScopedPointer> +#include <QSignalMapper> +#include <QThread> +#include <QWaitCondition> +#include <QTimer> #ifdef Q_OS_MACX #include <CoreFoundation/CoreFoundation.h> diff --git a/src/shared/symbianutils/symbiandevicemanager.h b/src/shared/symbianutils/symbiandevicemanager.h index 96da967f4c..27ba86aa4d 100644 --- a/src/shared/symbianutils/symbiandevicemanager.h +++ b/src/shared/symbianutils/symbiandevicemanager.h @@ -35,9 +35,9 @@ #include "symbianutils_global.h" -#include <QtCore/QIODevice> -#include <QtCore/QExplicitlySharedDataPointer> -#include <QtCore/QSharedPointer> +#include <QIODevice> +#include <QExplicitlySharedDataPointer> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/shared/symbianutils/symbianutils_global.h b/src/shared/symbianutils/symbianutils_global.h index 0550c64d31..d7c83fd8c2 100644 --- a/src/shared/symbianutils/symbianutils_global.h +++ b/src/shared/symbianutils/symbianutils_global.h @@ -33,7 +33,7 @@ #ifndef SYMBIANUTILS_GLOBAL_H #define SYMBIANUTILS_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(SYMBIANUTILS_BUILD_LIB) # define SYMBIANUTILS_EXPORT Q_DECL_EXPORT diff --git a/src/shared/symbianutils/virtualserialdevice.cpp b/src/shared/symbianutils/virtualserialdevice.cpp index fdf81ebcbe..84eff45d57 100644 --- a/src/shared/symbianutils/virtualserialdevice.cpp +++ b/src/shared/symbianutils/virtualserialdevice.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "virtualserialdevice.h" -#include <QtCore/QThread> -#include <QtCore/QWaitCondition> +#include <QThread> +#include <QWaitCondition> namespace SymbianUtils { diff --git a/src/shared/symbianutils/virtualserialdevice.h b/src/shared/symbianutils/virtualserialdevice.h index 6ea9a9d53d..3cbe9156b2 100644 --- a/src/shared/symbianutils/virtualserialdevice.h +++ b/src/shared/symbianutils/virtualserialdevice.h @@ -33,9 +33,9 @@ #ifndef VIRTUALSERIALPORT_H #define VIRTUALSERIALPORT_H -#include <QtCore/QIODevice> -#include <QtCore/QString> -#include <QtCore/QMutex> +#include <QIODevice> +#include <QString> +#include <QMutex> QT_BEGIN_NAMESPACE class QWaitCondition; diff --git a/src/shared/symbianutils/virtualserialdevice_posix.cpp b/src/shared/symbianutils/virtualserialdevice_posix.cpp index 694ae0f736..709196be26 100644 --- a/src/shared/symbianutils/virtualserialdevice_posix.cpp +++ b/src/shared/symbianutils/virtualserialdevice_posix.cpp @@ -36,10 +36,10 @@ #include <termios.h> #include <sys/ioctl.h> #include <unistd.h> -#include <QtCore/QSocketNotifier> -#include <QtCore/QTimer> -#include <QtCore/QThread> -#include <QtCore/QWaitCondition> +#include <QSocketNotifier> +#include <QTimer> +#include <QThread> +#include <QWaitCondition> #include "virtualserialdevice.h" namespace SymbianUtils { diff --git a/src/shared/symbianutils/virtualserialdevice_win.cpp b/src/shared/symbianutils/virtualserialdevice_win.cpp index edc55f19aa..e0ca69a595 100644 --- a/src/shared/symbianutils/virtualserialdevice_win.cpp +++ b/src/shared/symbianutils/virtualserialdevice_win.cpp @@ -33,12 +33,12 @@ #include "virtualserialdevice.h" #include <windows.h> #if QT_VERSION >= 0x050000 -# include <QtCore/QWinEventNotifier> +# include <QWinEventNotifier> #else -# include <QtCore/private/qwineventnotifier_p.h> +# include <private/qwineventnotifier_p.h> #endif -#include <QtCore/QThread> -#include <QtCore/QWaitCondition> +#include <QThread> +#include <QWaitCondition> namespace SymbianUtils { diff --git a/src/tools/examplesscanner/helpextractor.cpp b/src/tools/examplesscanner/helpextractor.cpp index 904f59aa0a..39bcb1364d 100644 --- a/src/tools/examplesscanner/helpextractor.cpp +++ b/src/tools/examplesscanner/helpextractor.cpp @@ -32,7 +32,7 @@ #include "helpextractor.h" -#include <QtGui> +#include <QtWidgets> #include <QDebug> HelpExtractor::HelpExtractor() diff --git a/src/tools/qmlprofilertool/commandlistener.h b/src/tools/qmlprofilertool/commandlistener.h index 1902da8ae4..4b8df747ff 100644 --- a/src/tools/qmlprofilertool/commandlistener.h +++ b/src/tools/qmlprofilertool/commandlistener.h @@ -33,7 +33,7 @@ #ifndef COMMANDLISTENER_H #define COMMANDLISTENER_H -#include <QtCore/QThread> +#include <QThread> class CommandListener : public QThread { diff --git a/src/tools/qmlprofilertool/qmlprofilerapplication.cpp b/src/tools/qmlprofilertool/qmlprofilerapplication.cpp index fd286dddb4..c60592981b 100644 --- a/src/tools/qmlprofilertool/qmlprofilerapplication.cpp +++ b/src/tools/qmlprofilertool/qmlprofilerapplication.cpp @@ -33,13 +33,13 @@ #include "qmlprofilerapplication.h" #include "constants.h" #include <utils/qtcassert.h> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> -#include <QtCore/QProcess> -#include <QtCore/QTimer> -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QStringList> +#include <QTextStream> +#include <QProcess> +#include <QTimer> +#include <QDateTime> +#include <QFileInfo> +#include <QDebug> using namespace QmlJsDebugClient; diff --git a/src/tools/qmlprofilertool/qmlprofilerapplication.h b/src/tools/qmlprofilertool/qmlprofilerapplication.h index 9c06734cbb..9414895631 100644 --- a/src/tools/qmlprofilertool/qmlprofilerapplication.h +++ b/src/tools/qmlprofilertool/qmlprofilerapplication.h @@ -33,9 +33,9 @@ #ifndef QMLPROFILERAPPLICATION_H #define QMLPROFILERAPPLICATION_H -#include <QtCore/QCoreApplication> -#include <QtCore/QStringList> -#include <QtCore/QTimer> +#include <QCoreApplication> +#include <QStringList> +#include <QTimer> #include <qdeclarativedebugclient.h> #include <qmlprofilertraceclient.h> diff --git a/src/tools/qtcdebugger/main.cpp b/src/tools/qtcdebugger/main.cpp index 4090f8a044..7259721bab 100644 --- a/src/tools/qtcdebugger/main.cpp +++ b/src/tools/qtcdebugger/main.cpp @@ -36,17 +36,17 @@ * See usage() on how to install/use. * Installs itself in the bin directory of Qt Creator. */ -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> -#include <QtCore/QByteArray> -#include <QtCore/QString> -#include <QtCore/QDir> -#include <QtCore/QTime> -#include <QtCore/QProcess> -#include <QtGui/QPushButton> +#include <QApplication> +#include <QMessageBox> +#include <QDebug> +#include <QTextStream> +#include <QFileInfo> +#include <QByteArray> +#include <QString> +#include <QDir> +#include <QTime> +#include <QProcess> +#include <QPushButton> #include "registryaccess.h" diff --git a/src/tools/qtcreatorwidgets/customwidget.h b/src/tools/qtcreatorwidgets/customwidget.h index 58f3c28afd..4a6cd8a9a8 100644 --- a/src/tools/qtcreatorwidgets/customwidget.h +++ b/src/tools/qtcreatorwidgets/customwidget.h @@ -35,10 +35,10 @@ #include <QDesignerCustomWidgetInterface> -#include <QtCore/QString> -#include <QtCore/QSize> -#include <QtCore/QTextStream> -#include <QtGui/QIcon> +#include <QString> +#include <QSize> +#include <QTextStream> +#include <QIcon> // Parametrizable Template for custom widgets. diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp index d62fe9a3a5..2e8efe4c25 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.cpp +++ b/src/tools/qtcreatorwidgets/customwidgets.cpp @@ -32,10 +32,10 @@ #include "customwidgets.h" -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QMenu> +#include <QAction> +#include <QExtensionManager> +#include <QDesignerFormEditorInterface> static const char groupC[] = "QtCreator"; diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h index d0c497695b..9cca30074d 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.h +++ b/src/tools/qtcreatorwidgets/customwidgets.h @@ -52,12 +52,12 @@ #include <utils/wizard.h> #include <utils/crumblepath.h> -#include <QtDesigner/QDesignerCustomWidgetCollectionInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QExtensionFactory> +#include <QDesignerCustomWidgetCollectionInterface> +#include <QDesignerContainerExtension> +#include <QExtensionFactory> -#include <QtCore/qplugin.h> -#include <QtCore/QList> +#include <qplugin.h> +#include <QList> QT_BEGIN_NAMESPACE class QExtensionManager; diff --git a/src/tools/screenshotcropper/cropimageview.cpp b/src/tools/screenshotcropper/cropimageview.cpp index 9473825d53..ac453a50db 100644 --- a/src/tools/screenshotcropper/cropimageview.cpp +++ b/src/tools/screenshotcropper/cropimageview.cpp @@ -1,6 +1,6 @@ #include "cropimageview.h" -#include <QtGui/QPainter> -#include <QtGui/QMouseEvent> +#include <QPainter> +#include <QMouseEvent> CropImageView::CropImageView(QWidget *parent) : QWidget(parent) diff --git a/src/tools/screenshotcropper/main.cpp b/src/tools/screenshotcropper/main.cpp index cf1a1dc743..1bfbb1bc7a 100644 --- a/src/tools/screenshotcropper/main.cpp +++ b/src/tools/screenshotcropper/main.cpp @@ -1,4 +1,4 @@ -#include <QtGui> +#include <QtWidgets> #include "screenshotcropperwindow.h" using namespace QtSupport::Internal; diff --git a/src/tools/screenshotcropper/screenshotcropperwindow.cpp b/src/tools/screenshotcropper/screenshotcropperwindow.cpp index 524b5f00dc..cd946e48c6 100644 --- a/src/tools/screenshotcropper/screenshotcropperwindow.cpp +++ b/src/tools/screenshotcropper/screenshotcropperwindow.cpp @@ -1,7 +1,7 @@ #include "screenshotcropperwindow.h" #include "ui_screenshotcropperwindow.h" -#include <QtGui/QListWidget> -#include <QtCore/QDebug> +#include <QListWidget> +#include <QDebug> using namespace QtSupport::Internal; |