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 3292fef039b..612aadd0553 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 c6ded0a4a46..5c24b2ee3cf 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 15aef143881..e2ea3c4628a 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 0bd0a6cc5bc..4f28f2577bc 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 46d36afa160..ec9d158cc24 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 f331f798ec4..c65a4adc71e 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 fda5deef10d..ba50af8340f 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 d6290e941ad..09ab264a73a 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 686f9972180..c01ffa9ab98 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 b2c04a2ac23..44ff7df6590 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 9b3e48eb708..d6f90c76f6d 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 d91ff34951b..3587e8c7cec 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 2c3a312c934..c38260151c4 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 34d698e86fb..24fad65140e 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 611f0e1ea84..0c0f7c2e93d 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 ca81fe1bd22..258d86138bb 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 9a2d7b04823..0dfa030cfc8 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 5c0b208ec3c..478355f6751 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 aea559407f8..6b97a57bb3a 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 26ad1a9e36e..e3eb67653c4 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 4c387e9e93e..778fcf0d8d7 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 2ec85fb0c3b..a6bea042018 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 75a9210456a..ff8896283bc 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 f04e5edc4b8..b032b6af27b 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 99d5ac25b92..cdc4b8e7e5d 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 51e4c654126..88b42d9a238 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 b9ffa9d10bc..556eced68d2 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 d1bc2f34fb2..901dfc09539 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 85dca22edb9..784f01e4749 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 7c3c2376bc0..004969333f0 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 236b6fbf904..c0847bc5951 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 564bbfae8c4..a057a601dae 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 a3071b086e1..00bd66155de 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 4d363aa7108..aa04f818ae7 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 7618235f05a..2a2ba9560b8 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 9fe52dd378d..19839f8e71c 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 5db83fe873c..4678d014f61 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 5b39dea3a1d..7fe92d1a8a0 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 2980103af2f..1fd8a820169 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 d5413e823c4..e3b447fe5cc 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 68b75df301d..af27609f846 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 460c51ff011..e945b9a01b9 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 b509cd7e4c6..6ecbf3a3ac6 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 8d251820fd2..37f474a09ce 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 79aef585e84..6f5f632715a 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 64fc7bfd461..644eb83d441 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 5c1a8dcb900..4abdd41a029 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 145185bd378..d73b2f10be7 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 e28de225203..dd6183a9a9e 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 df8c47dc2f6..7fdcc494800 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 5d6160041b1..148b67bed3a 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 7b62d57804a..ac3a52318ab 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 c8d568a5fa3..d24ec88c104 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 9420af85b46..e3164f04121 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 32878f3a1fb..b0d555dd647 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 be33e8ad793..72af52c2f2d 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 57c58992037..3f2bc55c094 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 ad798dc1157..cb947ef11ce 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 2ae53438e18..f5b422fdee4 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 d20ff316dfb..29079b3ff10 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 df82a1cc22f..c0ee0501b5b 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 67537648f2c..00927c4702c 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 4bfc89d33ec..f7a12bf286f 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 9da129ed35c..4b9bb3f31ee 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 c8867fc4851..1e7f3885e47 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 ccd1c55cf33..ccfef43cecd 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 9e1ac6a6a80..19fe90c8354 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 fba7a29110a..705fed1b01a 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 50d4982d259..35e2d6662b8 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 932789f2d03..1c36a669f68 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 a780f3f2faa..85bd8dee984 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 0dfc88f1352..a58006f65c5 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 3c98dbcc05c..29b4f7bfefa 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 a6d75993c25..bb6ef821688 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 dc1428e765a..e39b31b0a55 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 f93f1cca02f..60afaa3eb1a 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 db796e3bbf3..1bbecdd6cb2 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 043d7d8df7d..3729437da16 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 a98dd04e27e..5ac2e43ef3c 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 ffb65939d67..8ecf1113d52 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 6cc735993c3..4f7bac243a8 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 51d1882ff3e..a9f1451c487 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 4659c303be8..fd11cc231f4 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 29e51027b8e..6be8a45235c 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 a53174fadf0..0156f03a19c 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 7ae3d4594ab..e8a60d04db5 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 3f280cb8ba7..f17fd3fa831 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 516c989204f..417417ad416 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 6ac2379a981..2aeebdfbea8 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 356b88bdc81..0e0613d5f6c 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 0f7b4d0c7ba..1f50f440bb8 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 f0f13b1d0b5..f140646c716 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 c0668651e79..1386ecb45a9 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 45a5abea5f6..d6aa3aca9e0 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 38fea919cdc..fd5f3256e93 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 3b8b302dc55..1c45956b91c 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 d0c08481407..c4e9138efaa 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 5e896f5ed2f..356369639a7 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 bf958662ae8..59bd6744ebe 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 ef40f61a8df..6e1e38cfe8e 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 bba5ba61f8f..b7e0abae50d 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 431a81c0be2..4e18c859469 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 37147491597..2c715fd13e1 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 7d95204bafa..0deeaf7e215 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 5a412b09d4d..e0943a59ca2 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 b9c35777f5e..255f912c29c 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 3dd264ada40..0ba1bf04595 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 50676bc2db5..36b75b22431 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 822334c95fe..35cd9ea61b4 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 e1dcbb78175..216f31554ca 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 00b4a2a0688..2c2e7a71f75 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 8df24bf68f9..95cc67b3570 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 e336f5a15c3..d0922344b62 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 935e8d8c7a2..0073740da83 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 ee688590c75..9695cc55e10 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 825bbb1300f..25249899bf8 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 2298e2e89ab..21266aaf9e5 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 c67f1f27d6f..a1266094126 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 257f1fc82d9..5839152f8b9 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 9f9e1e28597..75a54994f30 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 9e2b9becd02..6854595762d 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 4432e45fc26..5d9c5b01911 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 ab409cbd28c..0c675e847bd 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 4eafefdae09..8b481bcb3f3 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 68207bc665c..27e7ac1208e 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 27d502972db..2cb7d036c55 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 007b456cdd9..b147a6eed87 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 7602ffc0501..1e52432831a 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 032001ebeec..d427ecc17fe 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 bb665990ec9..c5352102cff 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 c54bf76a97f..75543976a9c 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 76b5208364f..007bc0d4a31 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 ba5f61a898d..ff178f4f7c0 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 95fb92f4f51..77bd008de68 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 5cb8fb0d711..10dfacea0ee 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 f6637b6f135..073e298eaa9 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 c94ff497279..8e71d64d0ca 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 bf6d2697251..982801b0082 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 4af8d4d3cb7..8fe250b72ec 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 9e0d4804e89..0f457faafeb 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 98d01e05852..8bb3b702ea4 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 7c7afff97af..b0d30f9efc8 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 1c3ddd70273..aae1f3fcb24 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 9bd9f6de242..1b5a49b7108 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 4b881feae5d..c92c4626f39 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 fb00ff04188..6b3f7d067d9 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 d7b45db2c7c..ab936789147 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 a01893f5497..b9fdb64e859 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 52ebb322310..efe7f1fad99 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 43f2873cf5a..34555e03782 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 031c0434c0f..c791a7c732c 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 9a2138cbf98..ab6106af6b2 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 b6eeaf9db11..b3d7069fafc 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 8dde9bf32b3..81b71059d0d 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 5e4b38dd819..7816ac1cdb5 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 ce65412a7bf..4040fd35559 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 49c9a372f5e..651a04b25ab 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 74b564b65df..9ed0c70652f 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 af2192142bf..ed7a5df9857 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 dce10747d42..47dfc035b04 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 28f8b6f36b3..012e8b3e22e 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 730d8699c65..8d326b669ff 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 7c3abc30eda..0d8cd54a40e 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 bb0f172698a..44f062e1dc5 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 9d35f98dc56..a59584d334f 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 8553d2136ce..afa928be427 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 436f152baec..4746a27f646 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 e4734abe0e2..94688717d04 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 07a65eb787b..a52d23b2189 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 695d3861a4d..a56369fa2e3 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 138f7f4623a..01d5ce1b7cb 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 0a3a7059717..2621d114d59 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 522db4de448..a024980b1a9 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 b5b9660354e..ab44900870c 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 3aac7312910..ae1c4900029 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 d68e1d16148..37309ce715e 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 55aeca8e55a..f7198fa5d74 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 6980e803da1..4225efccdba 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 97f2792bfe4..25e1328c735 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 44bced4e8ac..5818100291a 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 dc580d5b9b5..7ca88425c08 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 648add70c8f..74cf097a2e7 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 7305a1cf9ba..a32d779991d 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 213833b1d59..a4d29486f19 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 5bf79b34ff3..20eedbc51e6 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 bf09e32ee0c..802b0e80f40 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 69d022f66ad..326bac96073 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 ef5cefbfc30..33f565b8a00 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 1071c604658..375f4a7a32a 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 b0edee4da73..1d9b591ff9e 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 d4b71afefb5..7288eb36c08 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 bd9cd7dad36..6b4c185252e 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 904635828ae..b3d62263dd8 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 a00c9b6a2ab..ab80832d8be 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 99e80093aba..4966f9afdda 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 50c6af64383..141e279f7f1 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 65b389a4c81..dedc0d08e6a 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 bd957993e24..fd5a4f3864b 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 a614bb71eee..a2fe6c79f21 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 9d6b9395c5a..9881c469258 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 68efe6e4356..b10be6dd502 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 2cf3d9911ed..eb9eb216a5c 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 36c5281acba..8782db7fc30 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 1ffbe58338c..26b12aaada2 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 3451ab39293..ff3b3e1850c 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 f600b76dfee..a69258802a1 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 96f6040ba02..c5066c41c88 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 76127075598..ddef12387d2 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 4cb50883f74..5cfae8399bd 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 fd65df3e169..15cabc42fd5 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 6dd561e1dc7..428bec5c8d9 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 c5f73ae39c6..6628988f82a 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 35eae5d41a2..65c9b6da617 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 0734c51d06d..4390150f732 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 123816bf331..29a85962a13 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 a5a460baecd..63d7af5828a 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 e82a5aa28e2..6ebf70bd53c 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 2b84ba7b60c..ee879a8632e 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 78b37b3c7f7..2d2f8054b46 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 1d3afb6149e..f1b7d807ad4 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 4be9d5d4063..6e4471a99ce 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 9a9b126ce91..1302567c884 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 2b695db34b6..f81f02638e4 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 33c820bb227..06c7f979d50 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 0b5cd6a81a3..f528837a98d 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 b034c58fcf0..bc37cfa4b6e 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 7387f51c9c0..0f2f17dee95 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 df09d0e7bc2..3d7de6166a1 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 f8ac4fa8fae..35d48898704 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 62b78f57384..a75defffcb2 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 9a9c8272170..3c201d31c7a 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 fd46d594d21..e47e1c96fed 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 6f25a038196..6cfe526acd1 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 b71d29958a7..e65ee0a01a5 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 80d2b566087..165d2035caa 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 2eba623ad47..ca757327b2b 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 08fa3b6b48d..267090b4ffc 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 7ee5a1ac173..2b813e1aaa9 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 247033dc416..fcfd0ea1887 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 2331bde76bd..3718a5dc7b2 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 a63368ed651..5177b3dcc5d 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 b63be0b9b6e..38a973bb7cb 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 5719f8f695a..fbbdf1d86aa 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 ed8f047c593..1b95f4121c2 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 de603875673..9fc458f7c74 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 346b5492553..06afc2c827c 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 71c09a64531..3d9b16b0ff5 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 19b3ae198c9..962f240d283 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 4ad7b9cd5ba..58a6a6095c5 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 2ff0a74e163..55ce1af26df 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 0a3af715c25..6dbec736cc3 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 792d3d29fb2..a94e6869244 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 3628f91b9b4..3bd9b2385d3 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 88d4b3c57cf..93b74a35f06 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 2a32fa5113b..93c05f5288e 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 7259a2d25e7..45f84cbe651 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 9ac747cf500..4a3cf3a723a 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 246e61140f2..517fb4644f3 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 54c18b6aa07..f88aefa3a9c 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 99c05e11446..0604d8da1ab 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 092c6ba05c3..82d470c5bed 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 6160f9030cf..5ac353bb211 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 1182748cc2b..bf6e7f89fef 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 a3bb33a789d..88163d5ea58 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 0f381087a4b..71495528488 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 5cd30c8a450..11a0df20b33 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 40a0d3b7bf1..0056e4c3bb2 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 6e194efd2b1..d0c194b7f71 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 662c182797d..c8d70380b9f 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 f5e11ce3ae1..fb901d216f1 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 ae781d7b4bd..02fe16f88a1 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 ae358a10bb0..f2a31e9fbf2 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 0a0b398f68e..59123ef899e 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 8662dd1971d..dfddf99b26c 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 31a54c273c4..8c54ebcad52 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 ab67d080c48..5ae1042e6ab 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 e5e55200dda..dcb5b746685 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 bf532e5b35f..d5cf0f6b67b 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 bc9911bf23d..31e99c31472 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 a5fc47de908..c2b2f79b184 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 c32fc465015..733741a9cb1 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 8ea75f4281c..eeaa69ac10f 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 ac9e32f981b..38412e66436 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 17d157a4671..9666ef1e11f 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 76f80919ff6..a5aa08ea773 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 eb1e99fe0d7..cf322e67111 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 ead09d7f098..80e564c5cb0 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 fb626b1b4ee..89e43d032ba 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 c7d5493b3af..3ce488e2bc0 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 71fdfc914bb..ab88206a737 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 8dbfead8d2b..08b5d8eaccc 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 a9aa532c189..983c6c68902 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 896a5a34923..4756e052020 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 e594f2741fb..8c1c8cd03ed 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 a7ecfbb1717..3b26d6c83be 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 cf0f1a579cb..d5386d91c65 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 c0c5f2a398f..b19c18b9f4a 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 8efa4e29870..e21c9d9fc99 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 689f0356367..e632881d9be 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 f07cd7344e1..83be2fad866 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 4484882e434..3a1752c3435 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 d615bf51250..506039e3bcd 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 4fe24c81294..7c00751ec68 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 16594c9f0d3..e79f65a60e9 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 8cf741adb3d..7af1f250787 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 486ec6c39cc..594f13c7447 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 c811ef4b9dc..a1e0e7eab92 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 679ef6986f4..263bcd574dc 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 0368026019f..813e1f824c5 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 db73596b0a6..ed4e96e5d76 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 d44d0c70c39..eba60a6ac16 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 f58cf4e23fe..771d1454058 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 086998477cc..c1c198bd404 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 85b9a43fd29..babd403b9f4 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 cc7a347874c..b284b7fc263 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 461949e6271..267bcb559f8 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 b56b834e269..a1abcffb7ab 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 d22fcb4382c..0e2cbb9d2b5 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 b7928016f05..1902c1c49da 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 fd36dcc943f..e2649941ae6 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 b724211e8a1..999bb717268 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 f2d9d111f38..4d7b1738102 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 31f531839e6..c74863e550c 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 6f9f81ab0a5..2a9790d9bd8 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 726f488d51e..436bcccce10 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 2be59387026..ec592ead185 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 967f17f4e56..d33fa309c95 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 98195435033..87a5118cd40 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 9cd10cca868..47b1eb364a4 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 3a0f425e21c..d3992aad6b1 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 d7fba7be5ce..e1a4136e93f 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 a9e62e434ed..67649c63fa8 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 ac5ad185f90..efd92478f4c 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 cc20359f0a8..7cfbbd1a921 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 0473de9f88c..94e7491e20a 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 0c60c32966c..a94e090025a 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 f77a48bdf12..75b5fb6c1e0 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 26d259686c7..1ea793a2393 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 9db26d6cf4e..603e2917400 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 6dc5ad508d7..8ce4be55dfb 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 70d74f7416b..a80356637d9 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 f6371947736..88f01ab4b2a 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 c2867fa189e..8cd880d18a1 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 76341da395b..7e0b7c251d7 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 4525be99682..983eb7034ee 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 8bbe08c4d30..afa7d2b3926 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 38daa8034e9..c2747407af4 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 f1df49b0d02..f2fbecfbc7e 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 0b90546f43f..50bdcb45d7d 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 0e0d28f25db..a8a3367c3e0 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 e57953484e0..16b57210564 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 9e5309b78bf..bda27e8fbff 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 fe75385cf91..5be75f47670 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 ca9e607c296..37a84980d8d 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 20e4ea0a4ec..651e05d7ce2 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 44324e3b4fa..24657428631 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 77a382a2e4b..b895007161b 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 d24e3909b75..3ecd06599fa 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 3ff002657dc..2e541bb53c5 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 52ba5d3d2ef..8e74fafb1eb 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 f85ab389043..e6d1b93b57d 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 f7e7526bf84..09d7d3cc2a7 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 b6b74416c83..5dd9d1ca96c 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 44735a624a1..72ed2dc1596 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 13a85d2f527..9fd234d7537 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 656ca52fd8b..015a3030017 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 e495eeb9688..0ec30b4d914 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 663aae79920..d16a9cdd741 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 5c540f22913..3cb86856bf3 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 6506755e8ae..1fce702ca87 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 c86f402b6c7..0bee4403436 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 ca660b657b8..d943453fec8 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 3296ebe06c2..2de743918ca 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 a8f03b8e107..e998c726cc9 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 64255f430e5..57c3ef834a7 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 ddae8335565..bea25e8a56d 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 96fea245403..d148d076235 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 805e4e028c6..f419b587dbf 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 c853a76d2d5..a348a6c611c 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 b0b7917ec36..414a43de7f8 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 333ab59d09f..3c80e2402b5 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 8d259d35987..248ef882bcb 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 e22588d1bdf..dff76119778 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 0c6d79086b2..3ef1d0a9895 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 0841ad6f5a2..90b5fcbb3a8 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 febcecd8baa..30258cab57b 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 440ac734c43..6a4345d516a 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 d967f37e9ff..711b5c37cec 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 4e96b35d677..d9b7f6816b7 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 63d876024ff..64648174df0 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 48515718bb6..088116e5623 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 9523bcd8b3b..be58d10e396 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 f0f03674695..b9ca693ec37 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 7343962260e..46e3347577c 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 4828ace27e1..f0ce8a9271e 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 b646a0da99f..89e0da49758 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 179ec50028c..02fdff35c4f 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 8257a29d198..696c8d6d541 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 8b7e517a8f3..71e27772021 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 069a92d7584..729535c5472 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 9d79309e749..f4961c6f1b0 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 86e49c5588a..c772e8836fe 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 ac50e58304e..1fccae71aa2 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 2050ce464b5..2607ebcb213 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 091eb2b6eb0..51ef04c4180 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 64c0b75fdfd..10d72cf8646 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 1faea1bbf95..d544cc9eb45 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 51f18fd75d1..3692cfe7cb0 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 aca61b8bfdf..acad731b07c 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 b4bd9a36bce..035b985ade6 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 acebc2382e4..07069918606 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 9182a730ef3..16fdb649b08 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 7d184df4eef..6e5c3d8d8bb 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 204d04be824..c7d2106c6db 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 7588e116d53..f4b200312c7 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 270c4e87fc6..4e1d10f078d 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 17cbf46211d..eb27098a08a 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 d49db4b3413..f4c3bf44f53 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 e1efa755a57..8f7611275cb 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 609b4636c7a..943d3a059f5 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 660d971f1bf..7e7a32ad2bd 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 c590fa7d271..31682c06b80 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 39c6d153ba4..27057cce2e3 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 54a007e2d65..7a61cf10ff6 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 04c17a83fb9..48093a80fc4 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 3b910d29513..9ffb6ae4c7a 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 8c89b719d73..57481bb77ab 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 c8e82e7f7c7..4e2ca18f4e8 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 bde6f3a7c8c..5a0984de77d 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 202a6dd1748..3b0b3117ea5 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 1fe60a1c1d3..24bee0b1b1d 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 7a4d51022d2..3dc2f4897d6 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 338b1fdfddb..67844782d4b 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 b03054377a2..9f0749e90e7 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 a731955336a..913f1b2ced6 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 267d2b3251f..31867236fb2 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 42a206f9c6f..36ccd1ca7e8 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 7a248e7da50..fb1a7279364 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 c3f99504e7d..2fe7cc0ffc0 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 323cf5de0d4..b2f4965b2a9 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 30896c45f69..4cce3a656ca 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 2071bdc9be6..c05e53dde71 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 a87592a3680..a4c8a088f47 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 f4b3252aa01..61dc0f47a8f 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 8f40962c4e6..12191ebbcde 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 fb171dee687..a7e8c4b6959 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 7f04c4994ce..c7c9dcaaae2 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 4e44c9e7541..da61ee85e11 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 69060ff2c9e..7709fff66c0 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 d91ba1e6fcd..91b89fdc950 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 05a662826ee..24c5fbf4ea0 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 01077e317a5..fed98dfc70f 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 125e5b50906..b47ff946c65 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 acd76347198..9701857fd19 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 23ebe70a3f5..e2e122c7334 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 904d6478e7c..f0a3714bdad 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 3fe8bd19322..7178f52028a 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 d6182a8a5b4..bf9a33a2b0c 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 49114297695..433af38cb08 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 35f045c60e9..00afbd63f28 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 e95271313b5..0bf1d8a9b29 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 b246353731d..3b16d7f59be 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 ec26f696505..50383da148a 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 201c529c9ef..1b5fe98fd38 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 ff6b9d529c6..623502c08e6 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 782005e254f..298b5655942 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 9364f10aa04..08494078a9c 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 e09b70a4981..8962500bf22 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 433042a44d8..0c742030c39 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 a6836a0f080..2eb3dda40dd 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 dd96bb443d9..384306f034d 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 a707de4515c..ac0b594831f 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 6a79a21af1c..b70b86dd884 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 75d38d42463..dd3f45c6fbc 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 81f6293d42c..38412f6c089 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 7969fe45f49..24a1aefd1eb 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 2f844de7526..26c9a7ef4fd 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 9ca8a2790ee..3df12fc46b2 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 2ffbc9a270b..99090b4a14d 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 2ae6b04aafd..40275797eb2 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 30eb6e8c682..f06b2e2cee9 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 7c3db34f22c..c5c97fef568 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 cdd6f36c917..2b9873cbe60 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 0a8211e0ecd..6c168ac3310 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 3aa2810eef1..c7a232876f2 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 964e660f737..9bb4ac4bfdd 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 d5074e440c8..6264427095e 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 80d2d58e426..aa4249f0e8b 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 d86ed5a8db7..e6aebc39d1e 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 66fc23b3d2a..17e3e62f747 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 b0164d496a4..68fa6d39584 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 488e32b3c2a..b4a786b0ec4 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 28595d7ecaf..ae534ecd905 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 f6e5b9d233e..8a9edc55844 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 9ebe217171f..3e968a5bc70 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 691ecb038d6..5387ca1b825 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 a4647456642..25809c0a004 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 ab9eb2ae189..4fea4cb0a93 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 e04b3c0a46c..c154233b136 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 abfe595207a..a724b23c1cb 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 9d0bb20d559..8e130e96fbf 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 bae11d024c1..458d7cfccaa 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 847aaa86fd0..5a7059c3fd1 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 09791842983..8736ea1aa81 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 b2bd2c62193..e569bc6088f 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 377053be04d..369c132403b 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 4420ff50831..50eb340c943 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 e50cf80aed1..ad906e78e0d 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 8e7fc1ab697..36e93d0a3ce 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 3624eff5e23..66ccbeb8149 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 1f3df606f06..4185aa122c7 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 7c7c3e79631..e6f9f61568a 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 7f54267e0b0..3852e1a1139 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 90924ae52eb..dfcbe263fd0 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 272cf01fd93..191f97afd16 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 ec480868f71..471cca42e0b 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 a66f9ec4391..14cd5f38d35 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 f43508eb9ad..5fb0093b65a 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 a03b4eb9d49..a394b3c6180 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 bc69fa9a10a..9fc53773d4d 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 f88d0c60fdf..a6c72d51d13 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 58baf35f59e..8e097cb0028 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 950ac3f74aa..5a4e5f0b43d 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 a2c4ee80d89..0d0cf5cfc1d 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 c52df6f623c..40b4871c933 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 9dc272a839d..9276d5754d5 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 79595d4e258..5143f2ed8d0 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 505a43224f2..f0e8e39b5f7 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 33b2d2d1e0e..43be05cbf75 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 cb3e7caece5..bd73145866f 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 76b6b06fb81..622c6271fef 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 e753d0e5397..b95c516191b 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 6234dc870bc..5c1d3af9457 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 264c9e6203b..03ab660f61e 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 ad804720c40..2d4a0df5009 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 99340383a56..e340f9b68b6 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 bea2d5d40d2..434e700b111 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 9f47806f366..1b213239011 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 7810cab9d76..e25cc77c596 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 dfd74c395b3..ff5fc62cec5 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 ae5ed076415..da9ca8db145 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 c6a83f2198f..ad3d833f4bc 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 93e1669245a..8c47eae1896 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 6fee59a450d..f661a2483e7 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 ed96cbaeee5..b8d664f47e2 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 9f7cfac9e32..cb4433ed452 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 88fcb65ef45..96d69f06c55 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 de44a834e26..c43e60656bb 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 6c007b422d0..4c909dd445f 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 027077ec86f..d5d75de3cc3 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 5d2c9f837fc..b22ae99e554 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 a923b1e25ae..945afb4d424 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 eb21bac96f1..e869c3366f8 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 df1d2feb7ba..d507cf1f77e 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 b6795c25492..6990fe72f65 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 2cc361f3496..3864226416c 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 dab2664a7f6..6d3ad9eb816 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 aef689c0d37..bd87c17cc78 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 2e92ea98ea1..36102d4d8fd 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 64a27a67379..1349b06e64d 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 20c3fce9436..8e457840e85 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 2a736f75468..5e14bc7faf9 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 2fb6e44ea48..2a7e86e0a69 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 3a76b5dd4eb..3869fe8ef95 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 cc2d841a3ea..e634d1db107 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 9d63d958623..19b2c8688a0 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 7b7298ad5eb..c8e38fc6494 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 abccf70f9a2..1d4617f2ab5 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 cf3ec92eeb7..a2d2fefd7af 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 fc412284162..6126337f99b 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 667178c8007..bbf802717a4 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 902c65e05fe..f38edb02543 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 d5c800ccfe1..be8e2354f57 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 12c3b02ddae..900f8f80f51 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 8240ed56da8..816a306c7a7 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 bbc07249c68..2b2282dc578 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 d6606acb957..fac8c5ba6a9 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 93f8b5ca471..1c19c2f9cc3 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 f72e7f7b116..67c7d93c97f 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 9c8d89cebb4..6948170686e 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 6ed623ff3f2..8f978ac2d35 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 7262eafc3ce..bb64c2b780b 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 0fc2ee50049..c913a794f3a 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 ff4652dae85..0c896f98450 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 104c4ac75f5..ee925f7e75c 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 167a3895863..d62d6e11dd8 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 92025eeb968..372b342a433 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 c1dd793d373..54c64a84837 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 f96ec6edae3..b8baf32947d 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 f65ada2070b..aa5d79e01c0 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 546b0d58fde..02dd359cde6 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 23905533a7a..5599e2fe12b 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 df407974da4..20c40bfa5eb 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 0fcef56838b..f2daf4b1b73 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 2b26d76c203..cd9a33f47e8 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 304a25f6e55..7e78050b13a 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 8484932c54f..8e693ea2eaa 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 bd608ac87cf..e8c1eb613c9 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 91b6489411e..2d720e872fc 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 2dce06eca8d..2ae6d1fbc14 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 d5ac629ca13..9af09b002d6 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 f89c728d8d5..9024bd2379d 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 b8890480d69..798ff73154a 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 8c527d7a7b2..360b3574e87 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 065960a1e49..4b50faa91ce 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 92985ac6f09..376559041fe 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 82a99832f0f..3fb32973fa8 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 68e752979cb..028ef9387fa 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 35ba8fd0f1b..cccd85acb63 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 b24efe3b555..00ac696025f 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 af8da970e8b..650aed03e19 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 1df4ca28e0a..6edaa7c69b4 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 d2205059a54..f3d47bb7820 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 04059f5f625..c66574f4ed6 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 0a5a7a67dd3..07df5dd911d 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 f3ba197f740..5492d7b2bef 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 d05aa34320d..524b3d7f8a2 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 1f4b971496e..d2ced6e1adf 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 eabe6c53541..462cf4c8cec 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 c0a491224fb..b01776fbe63 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 95732790228..3830ccf38a9 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 0e9de809cb7..151d89e0bde 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 9409e3bcf1a..d20ad35a791 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 a42bd3703a7..7746056f7b9 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 6df2dbef603..442108a67a1 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 3388af7aac1..d41a7c204b0 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 4608520acba..118dd589a3d 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 836201a277d..c0deb7a5e22 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 48b2ec38321..e4e0b712d5a 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 2f9b235e92e..82cba02a943 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 78b49dfd920..ee856d081d6 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 fa063aea6e1..980768e5936 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 fce65515375..bb8ba134da1 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 9c04ca762f9..54790a57147 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 3c79791d36e..b7af611ae23 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 2b2b4ae8972..b7090de6e9c 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 347d8546deb..406d9b94678 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 90191539483..ac79df8114f 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 a8aab85d835..6e6d3e30eef 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 9a6480f23c9..ee7411ae9af 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 2da7055c1e1..827e8ad5eeb 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 e34e516ce74..7a5e34ec543 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 78479f06c22..a87f6f35652 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 7553d092d5f..727f0c5fa53 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 2ada826692f..923fcf6819b 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 69bee4b5683..072cce98069 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 386a18f6bf5..f082fdcdc2a 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 500d757ab2d..247d4ab3c91 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 78ed85367cc..23ed9bfa0cc 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 7bfd97b7e34..6505989da90 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 ec12ac00361..93f085804d9 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 738e21c86f8..886c3698563 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 4e172ede854..ed8510f9361 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 13704c55aba..e6e3e206511 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 fafc1a6f142..192a84b44cc 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 0cf2edfc96f..6a08b4e1cc3 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 1af24daff93..ca029a0448c 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 82e72452c84..2a3c9d2289a 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 d3b638ec70d..56dfc541f5e 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 c10d928dbb0..50f21656598 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 2b93b782f7a..8dab0dbc81e 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 7eaf74601e1..de1d65cf698 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 3dd59118ad6..b1239b5b491 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 070d711b8ce..10b6297b8ba 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 197c19baa2a..c40fbe9ed68 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 fa4d7fd1642..868d4540848 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 527deb33863..7991acfc627 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 eaecfff940d..bad78b32119 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 2c76ed3edf0..781786f425a 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 5fe943a8067..c279f8cd0f0 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 876a356c1e9..6fc9a4019b8 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 90712396264..99361c5f384 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 e86563d5078..5d13f12cf0c 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 e5ef29d3a25..9776802c110 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 0db47372a15..bb5867b4039 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 15109e0f00d..b3df9853034 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 e7d0675de11..025e0662311 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 4373449544e..fbcf00dd996 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 030a9c018d7..1e71c236b17 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 af57130071d..cf61b745592 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 ec27076d446..038ce59b751 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 3f3c3c8a50c..92a448d55c4 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 353dd7bdcd3..065d3c5e1b2 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 ca441f50268..c72e65e46cb 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 48025b6ffba..51319ffc965 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 ed663f04829..4b7713cf7ea 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 e3c1942bac6..2d1b333c194 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 98a8e1741aa..282f46e6c51 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 9b2e5aaee3e..330ff17494a 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 78b6b6b9143..a6e48f1ea25 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 d6ba8d9dbdb..6f9066f7671 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 883f18d4fe2..33329d1046c 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 23310c399b1..1ad4e203a95 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 b1fc1a5567f..944d4713929 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 4779590caa6..478cf556854 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 89d812bdb1d..87051bd8ad5 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 2fa0c8cc8f3..ad0495942cd 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 92210ea3d02..d004d7cbdfc 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 0cf050f2eae..4127eac99e7 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 45b3fc364dc..b88f40e78da 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 693f07cb3e2..7c376d66ec4 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 6cf7a369718..9ad8bccfa90 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 0b590866ee7..37ac0cc15ba 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 c335badc9b8..f05225931fd 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 5cb02fd093d..64a8b568d76 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 aca25ee0ab4..4196eac41c7 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 229ae68914b..d0130ab1d98 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 13c3a518506..8cfadc2fc78 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 d069bcd3482..36ffe2751f3 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 e23e3208240..2db19710203 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 b01ccdd5849..5b42fad78cd 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 c060d94308b..815424e5be7 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 2c6860928e6..8c167ac094f 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 dd6706d4173..9296365396f 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 36357d0de36..c718c2531cb 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 1bd674094f6..962c613889e 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 14c605bcd98..e2cf6d60fd5 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 b85a4e3d5de..789497a7eb1 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 55e45a7ef8f..2a46d1c9884 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 c0194c53327..2f6a8421a70 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 978af61f2f1..46e7ac7bebf 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 6405899d29a..3e8ed9af63a 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 cfd7edeaef8..703ce957175 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 b010777c6a9..0f4bf4b2290 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 bff8517685f..b554938cb6a 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 211abb9ebfa..ea052c9b9ee 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 a25af578871..4718a1cc9fc 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 1eb06d24865..6e683af4de3 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 bdd33a7e984..3d33f2557a9 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 51dffe217bd..a4fcab01764 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 f8b711d8670..237f12d902b 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 bcb6482980e..fe5a76ae829 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 081a11e6f23..d35c9ba39ea 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 b605e747c4a..db6616f209e 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 13688bbcec7..d050f52e054 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 372dc85e911..530a2eee65d 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 5b22dedb8d1..1243c685b44 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 dc70876025f..888b8a1d52b 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 f9636328b52..312cb30e644 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 2b94fdf33cf..5132fd328b5 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 a85426238ed..c4486a624c8 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 5b7f7e08946..2917f3b698d 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 e87a9268e1e..5a1f4f46375 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 e28e2422d93..cbcc87b1394 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 500ae0c99b5..1de7aeea54a 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 f842f6ef764..d2d8e52a946 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 859f24db861..6c556d222e8 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 cb813f9de03..cada0ea9d30 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 8cfbe29ec16..81346636e73 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 3a164a4f137..7270d3e80dc 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 5f83b1cdb2f..6501dedd2ac 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 c9a6b7853a1..d7ac689cd9a 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 b48e4466b75..8c995c622f4 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 940b2b1ad83..e8dabf52b50 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 e65896dcc4b..88365f5b84f 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 45b9423b7c3..a79632efb88 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 4bd8ffef706..b67184c1321 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 2003adebb5f..c258ac79365 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 41365e2c9e1..05410a9d61e 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 98c734c96f9..310cd2bfaf3 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 dca87aebc17..a9dd32c0a47 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 418a0dca6b5..fd21906a510 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 609777bd184..63f71674ff8 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 a6ecf7a331a..d517cdedaf1 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 2bc0ca3f65c..8a5b7a1e51c 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 92ba0f57953..07034fed923 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 f4de4e1f70c..f8b8fc3df59 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 117e81122dc..df721160e25 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 9727f427649..5559db1d270 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 8705bd96e1c..47da2f08fb3 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 3958a8945d1..0b0060ffa63 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 7de5675d3a1..cc510c2f883 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 a31e690b5d1..b9888a54419 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 26ee53b9a25..9cd71bd3a9c 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 be333f05b98..d690077ba07 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 4d22a10a440..0964368e056 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 080b0c1cac4..8acff6ede48 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 3f438235574..2651c98eb00 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 54aea5ab495..2b88f1344f9 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 8f26d2cd0c0..a11d0ce9f57 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 d206e3376bb..144382f175c 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 d5cf4d29b6c..4a5eb88a5bc 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 398e1ea9310..1c6765f4fc9 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 61385a58c49..b75e1ceeaa1 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 7a0a9eec28a..a80854111fc 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 2c155c9d963..29780338496 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 71f218fc46c..35b9670ed6d 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 41149885ed9..4ef3b8db3c7 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 2bf108892de..8c5a9fbd019 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 0d95dd62503..4bceac728ff 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 2e64afd83ca..96078d6c90b 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 48aefd21060..236061a7ab6 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 e0d0afa46fe..2857bac1b41 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 9f02c496826..623155760f8 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 4b6892617b3..d7fa3413a96 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 83386d9685f..41f5c77cab6 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 d60d0789b90..60571885191 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 8b7023baab2..73cdf628d62 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 ed9a7008646..9787c014088 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 e194c65397d..c621df176e4 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 ee695444ace..fee16bba5b7 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 2e43589bfec..72631e4b5b8 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 13283e97fbd..d1370b025a9 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 cb20e6e0b37..09b725b2b9a 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 ec6f6f8a787..e25a8833057 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 3e10a46610f..b8e45ae7369 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 f78a8633316..d36b17f4fcd 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 59d5258d0cb..9ec6dc9015c 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 e657db49267..a326ee3b5fb 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 85c6bfc5836..7a7b72c128d 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 07ef33559b1..69e0de76ba3 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 2325e80e6f6..1579875bd20 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 c42852d3380..aef7b724010 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 9201a5d461f..471eb42b76e 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 fad0f2e06a8..f9f9f0eaadf 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 2325b7fc001..3ceedaaccc4 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 e07f61bf1a5..b1c74c8b72a 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 d6ec3fd08ff..b95b4ec6974 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 fa56c040671..df9bd7be993 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 596fe313f32..2df2e688228 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 b391d969700..68bd7a2f947 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 98e1bd22f0f..1368560f267 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 e4732e738e8..0ae014ceb48 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 84bc348f290..54ed87a23c0 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 3d00545f0e5..98d85414e99 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 2c58a5c0a6e..04bf69c4c07 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 31523d02823..76de0bc65f7 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 92e3913e626..1f03891fef9 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 aeb826c8ecb..2e35ea43524 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 6e498c12686..e29b7c6b2e7 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 8e4b88289f5..93d09a24151 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 0fe487d4961..020eda2ecec 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 ab7eae62037..2affe270f9c 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 3edc8ff778d..553277718b4 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 9bbd7df98c4..e950ef4665e 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 010651f4878..6c4fdbb62af 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 6f76bd568b3..6be47a76551 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 2db4f0d026a..00a3636761c 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 69848afb4fd..b8c72b5305b 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 1e15027e4e7..038440db885 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 390f0133344..ac9c1b655db 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 391db1f3005..b8021d79827 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 5ffec44fd24..4096245e98f 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 afbc1f2e1f6..d3065fa0ab7 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 c5231422adc..4c67bec3c7d 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 fceb12b75c3..8d675e7f08d 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 0db19205f74..6eb21e04987 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 eba042ef6e9..44a54995074 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 b0434b92bd7..5215cf8c47d 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 3922d6866e9..5af4b463a4c 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 92528227721..8b3672d08a0 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 fb55038e467..d77f943ad23 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 e82aebdb3af..c773a62ef87 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 c18d206c399..0cf6eb48dfa 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 5b2d6e7536b..f6291c61843 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 e9c28d69c1b..b55df33b808 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 1227ad0b7f2..16b2fc689d6 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 fe5e5155d6a..4e3c1e029c3 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 815192e12ec..6c6ea44c6a6 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 ca489fd754d..c0b2dddf187 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 7fbbcacf287..b897d576de5 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 2a14f012f6d..8a64ff186f1 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 5d2cd3f4333..245d118f1cb 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 36063fc1ce6..59d4fec04d6 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 c9c87824c4b..8c75eb01e6d 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 c04ae64fd75..6218230efdd 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 f60bae1ebb3..3a52efdf72d 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 edeb582b3b3..4d7aaa062b0 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 dec41b9076e..a1a32a05bed 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 6123e96531c..c0bf0c7b54b 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 0df6333acf9..c90aaaca9a3 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 6693e9a213e..7e5d217538b 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 f1d5d2be598..29972516d52 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 81b1b7a3f7f..f5be9b430cc 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 87d455a9644..3a239579cb5 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 d05dc992cdc..d6a946936ca 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 e12a37b201a..45c06b0b67d 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 9552fd75862..822b1b26a3b 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 3defd2c1a65..985f5c6328b 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 eb58152884d..bf9eee1989d 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 bae0a83ff15..9026b3dd66b 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 949054bcf73..f379fd19514 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 3f87f6547c9..e56c0859c88 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 3c19208950a..487fa90107a 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 9447caae880..68be516879a 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 caa3037d152..f576a3bb056 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 62f5969e85b..c627f1f9701 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 12b939320ce..3118353e0b1 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 0ac39ebc307..66f2fe87e12 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 30eafce1a9a..810ab1b8635 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 7339a967ddb..b44be271490 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 1a6f7453995..c682758c4df 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 205d9820bc0..12788ea66a5 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 ba170bc5505..87b52e5ca17 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 3874da23b97..ba8752b25b8 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 4ce200a3079..ffab76138b1 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 d9a329c5a94..b898e005425 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 8c86ab8fb1d..5acd1f6823f 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 8bdbc8f8495..48bb48f6424 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 88e6bea621a..523936bb9c8 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 4e43a57d21c..12cdab02787 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 d1e077192d5..00bcaf4f482 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 85c1094d5c6..c05f601f933 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 e4196c05525..d418176f8b1 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 66408e727d3..6c0d25bb84b 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 56f3155e96d..015d6ff47de 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 d991b3e0862..e260af717f4 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 5e9e0939b92..4a3bfa4bcbe 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 c127b389721..29e8c197e39 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 e754e09f576..de1888eac79 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 28594de0637..7efa527c420 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 fd4ae413bcd..b4a54d4d6c8 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 b985d3e10dd..aa4f07e5b68 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 bd82e376238..38df4a52b53 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 e8011f95c56..928bbd0c56d 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 56568119f74..fab80c3e7f5 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 6b05d786d93..f7460b4a095 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 8e4e588f6ca..8531edeb77b 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 f43f2c2916d..b5f4f2851df 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 a07c9a13bb8..f6150077aa9 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 cb682714cf0..a63b39b6d8a 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 22a1e48d003..8ef0d67809e 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 cb505fb0531..71381d17be7 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 db8171c3351..097fc1ff8c6 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 b3da7cfb92d..bf64901073e 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 f52da380b12..9352f8af174 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 90dbeca08d6..28f373a762c 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 92fdfaac88e..475b3a2bf52 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 bb00a5bcfdf..be03c3dc6a2 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 ca4ad77b5fc..30daee7dbc8 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 721c00e1403..4a9d884143a 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 b64a40ea73a..ab9f0bc92df 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 e2f0959a1e9..f66169ffd5e 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 4e102c96a5a..6b034a7cf38 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 b9653e01bf5..4988a9c621c 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 9ca85172c37..5a6d782ee48 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 2d0b53a5c42..df458b12840 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 6e845f02e84..6a81adebab3 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 51d14652fd5..1e99b409e67 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 dfef9d4e07a..d7e6dc0ee9e 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 fd7b1bea834..fd9b48f204c 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 fe188349030..277d219d55f 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 24509999c7e..75d2214de3f 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 4b87c0b8f44..617acd279fb 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 896ab6d3cd0..df2186a86ab 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 27b7979e6fc..ae32c0910c6 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 1c4ca138cb6..34ba473ab9c 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 61320d81b39..26f2d7e23b9 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 ad5a83bdd3b..d1e7c5f7d82 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 886f4d24c03..67550ca2317 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 1b4044312e1..75d592612c4 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 64be62e6da6..4fe52665ee2 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 20559c3fc07..7d14080f4c7 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 8872b670083..b8eceb62031 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 e3e07d06318..62c4c35a102 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 898d54c4557..0020cdc7248 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 a28348e2385..46441dff47f 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 ba6f441e9d2..7bc78818e39 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 5d63fa95ae1..6fc6129cc24 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 d451791ba43..dc485e1410f 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 bdc27fb93c7..1d469ff7cce 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 1c4f06c0139..9bf8a43440a 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 651f8bd2b42..cb5b6ab6009 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 5bd3bf944ba..fd3f59916ef 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 e60ad3c344c..aec04d9e5d8 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 f254d4c94a0..4ce7bf84a26 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 3d433307130..598d71ac294 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 9f8793e3e69..f196109af2c 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 6f6dea92993..9718493d1c7 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 0ff7379b3dc..332d85486ea 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 032a8c4d7b2..95db0b78a39 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 4191945e400..8eb4621a799 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 f862461399c..4af329a988d 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 2fb3b110e6d..e8e982b2d97 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 d2832b6e915..957318eefa8 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 96dfe08dfc6..d0aaff5d74c 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 035ec7f8690..9802ec4fb60 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 8b1c693664b..516b0d74329 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 e6261a072f7..c4df9e999a7 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 43a7600b863..5da760b77cc 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 bf5d34a2454..e8c3d15f0ca 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 31f289eb41a..177d79a270f 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 e0c629ed74e..e381dd014a7 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 f55234d54bd..6526f7202a1 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 7ebd9b1700c..39545818d92 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 b0b649c1f8e..b3e782698e0 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 7c5d634ea63..e7424eff696 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 da696a31e9a..cdce9b44255 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 2ac944385f6..65f7e90f54d 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 4d2d614b59f..7fedd292e7d 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 7d70585d18c..238555849f5 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 363585e1ca6..c189ffa6907 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 e8ec9381bb6..bcb3ecedd37 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 8a482e41264..28f178d2ad0 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 6f63aad0c8f..60401364ee4 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 0c32328ed0c..048a8e99e3d 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 e25384e0618..d318314a98e 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 adeaf79994a..01c35d0e5fb 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 f3520e3be3d..d0c134360f6 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 cd9722ac920..6a6f9a1f699 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 48ee84e0527..99a81b06bd0 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 6c6c8c7dcb9..2361045ac22 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 b023beda8d3..9b8fbfe71d1 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 2f02f0bfdc6..deadc5ea34d 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 3cb89b60fca..e54128266b3 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 55668acf70a..769ad54fee8 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 9f8f46ee029..4951cdeb46b 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 49dd40304cc..18e3dfa6a92 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 1fbad7c53d1..bf6a9695a87 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 28b864a4562..bd7a30fbd01 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 a7b0b2408b7..5ee46ccb04f 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 891fced1683..c24fc3bca9e 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 b71135d728f..ed5f01a90f2 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 eaa7f559218..ea2011ec934 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 7c6d3a9a94e..025f926df29 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 39e585c8bd9..fce2d453916 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 e7be5783b50..6b9df951bcc 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 3692d48cee5..60f9446d83d 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 165483a77e7..444c87357d6 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 c71424b4aaf..ebebfdc4576 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 1bc1ced1969..601f5386bde 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 a4bc5548ed6..5d8ad0d3be0 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 1452e0460b5..b7c5211a5d3 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 925f15e7974..4da766d0999 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 102213995f3..bbf4eb08b49 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 29a978e31ac..47a7a07c1cb 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 42cead49b29..b63ae1639ba 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 809e3ca1234..744d2d3bed2 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 060af4c5bfa..6530ec83f6f 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 994b18c6294..e1557fe3bf2 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 b54c73a7c95..3a502bcc345 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 9b7c271bfe6..17c01383188 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 e3f0b9c1e40..74dd7ddd95e 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 c2efebbce7a..54a9eda1711 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 e7e6a12c61b..bfef154e3de 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 8af35813e5c..7420eb92b66 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 d121281a41f..9f0d4cbf0ec 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 54c25d62683..2f722f10597 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 8881ed36c31..db7abfda713 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 1ea30e45961..21faffea3fe 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 6018bc6b847..25bd87af9f5 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 869ec185239..669645278bc 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 1e387725698..321cf631d8f 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 39ee7d0719e..7e4126d3d44 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 02913adb1c8..3f47c172077 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 88ee1002ab2..f2f00651a4d 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 25cf15445ff..1317f978c16 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 e7e60b149c9..173f967845f 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 9db01711a28..9922136777f 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 daf7d498164..07b11cf2aac 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 aa867b8b869..3c9057888e7 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 91d3e089005..3c50510ebaf 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 2b887dc2415..a06eb58a21b 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 36aa1654b96..342324921c5 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 2d3c4018ffa..7ccad82f1cc 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 ac32f1e3db0..56ef88d9b72 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 49fd05b96a2..a79d4a967bf 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 db2416bc2aa..18fe4a9d4a3 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 a1cca739c08..7c340e5fe76 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 f9b54c7203b..5b423c33f98 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 03cbc2e3f8a..88e7c58ccce 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 631e2bec86f..fb7eaa124ea 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 a947d4708c7..f86409e1d69 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 16b29e60252..66aba081575 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 9219a322cf4..dc220f4f301 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 ef7f2e2ba0e..72a6b5e9d1b 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 ca075d6e2d0..0731ca1bb9a 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 8ef27f2075a..857af6f0b5d 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 aab9d439e23..a6fd24027c3 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 65714b52e18..6b33689baaa 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 83f6ee6c896..2a33573b820 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 bd5a503f740..3ca77352736 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 cec8bf8807a..dbc89620524 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 090274c1f6b..a65a0e2e089 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 9cf66e2e81b..7d44482a553 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 0d598be92f9..82a1cde49c4 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 f128a106f65..99f8a1e873b 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 ca765cfdc20..400cf4f2963 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 47ae8f2040b..28da9d0e867 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 4410fe03043..19e685eb2d4 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 9a0fc297a07..19e88423d02 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 7a918116b5b..8c5a56a9e7e 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 9289066d87a..f7ba5f8a122 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 755242a19e9..2eb3cdc8f92 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 e6e594e5eea..c9ca9e084f1 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 2acda23865c..2cf9f2814a7 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 48ce67f9c28..1b32faccded 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 9a92f7e3a4d..7ce01a2a9f1 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 3a009adbf10..61f39fd9b03 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 f986c24a627..37105cd1ae5 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 a691eb57317..bf96475ccec 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 2149834dfb0..bf11ec84dab 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 9594ac4c982..4845d206626 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 8d46cb202d9..e0d313bc6ad 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 aa9c2dee75f..0fef938004c 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 43613cd5285..a29933bd322 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 e4182ca030a..875bf44faff 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 0951f085993..7c1293c4886 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 133d67cb02f..c3b48ae3b16 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 a94e4365286..ed3ccaff0da 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 7154071b90c..8fb6d3e286b 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 090b06a717b..18d3c8d040d 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 8a23cdff653..466569df7f9 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 b8dcfd850ac..3fd60310ebd 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 cac39a421c8..cdcc2c0e79d 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 8a75ec06183..1bc8459650c 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 af49298061c..4e0800ab5db 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 11d58f3e801..74327b090e4 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 2ff8bf148e3..04b79afce3e 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 c15e4f321f5..a7da2c206d6 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 e2c64384333..77ce8a59fc0 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 44570ca6dc4..2dc176ae360 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 62e0093149c..6e5713486e7 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 5efaec8d7bd..111dabfb3b0 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 8dfdd686e48..bbf2bfdb44d 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 c9eaf0c0e21..e4d8ae5cbe2 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 1038e2bca30..a35e6d43f03 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 26f908f36d6..d28925e639d 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 7fec768932b..6b77357e8b5 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 cd73b6278be..d59998d8036 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 5835e3f1bcc..f32e2a3054d 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 56af8891f61..efacf68befe 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 a2fde761b56..57558bc193d 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 45a3ed835b7..9f06e6ad8a1 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 b9235643a80..dbb42301768 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 6866dcea695..288b63c715c 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 4e00e3c0f85..7721e1839dd 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 162ce28538a..f9ce5824868 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 2313a421800..a8952e2e2f3 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 b6361e2a21f..f73366c66f3 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 675870107fc..298612fba5e 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 0072b353e31..28a433b32f3 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 e8ab53fb8b3..ae8cdfeba8d 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 3ba772e632d..8f12c1babb9 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 936e94cd6ad..029a575422b 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 9413f3512f2..d044c30c4b7 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 d79540d2552..154a085baba 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 d1b3e53713d..78b18409f1e 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 6ce85cd4bca..0fa3894ff6d 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 993ed16b09e..04adfd255ad 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 2445596ed7c..0c6979ce73a 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 1e5f9524af1..0e881c3a0f8 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 328a50fc9d6..57a1db19fb4 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 6e4b7c3ea88..27a90147c7d 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 7fa9e18d158..a1e014baf61 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 02456f52fad..900867c8392 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 5ec6af35c29..849c4975149 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 f4cd100663f..2a19950e5d5 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 d0620e3073e..fd39e54855b 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 59455cec2e7..d01cdec7280 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 c8c297bcf9c..29083ab4ef6 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 9d6a967e0df..5dc832829e9 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 be3a0bd6ad5..7ad3831ba9d 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 521349f04f5..d25e1b69dbf 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 d50761ea591..d93f8588f2e 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 8381940e803..e4de7cc401c 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 d552b963cf3..9b01066d101 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 d6abdc1eb87..5b87fb329ed 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 2d96ba5804e..44895219814 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 d6379ecfd15..6dbbe948cda 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 eea2b381964..d78c99f050d 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 b174da8e356..daaaf1dd9f4 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 ea9a8a24ccd..8bd0a454518 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 13343d208c4..5a8117a7260 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 76601c9a4f9..81f7cb468c4 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 9dcf57fb5bf..bbb42a89052 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 34d4d6c9785..b47c5b9d0e6 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 8cd7b7e781e..3261b17d95b 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 48305082f58..9633f22830b 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 aa9abef3077..22020abca87 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 e212435d24c..a6b189f6d10 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 23fc70c6531..6ec6c8799b5 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 3ff1bc3b3ed..3f1abfa1155 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 9463f931ab5..c7ce9149fb9 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 3461930e7ee..a0c723caf6a 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 c9bc7d2dcee..592892c37dc 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 6bfaec3d6bd..0807e562395 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 eb360c8c9ad..772c1bf3533 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 e347bb8e969..ab42dbf46ae 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 68b489664f6..7ed32304bf2 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 3eabcca4ab9..dead719bc88 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 d55b8db62eb..9aab63c648e 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 e3cb40ad5d4..bbe2d1a8d1e 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 7146b5fe97c..786579848ed 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 e5c808eb7ad..1c2f7ed36cf 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 306429afe6b..e543f2b9cfd 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 8d31cfd158e..880d07b7f11 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 3d3f23593b8..f49bb7d8cfb 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 9d5e38aea91..e60a22c9960 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 d2e4f2edc3c..2a6ed543bf7 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 729a60a8d7e..c72f151db94 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 d6070344d9a..8d26f4a0e3a 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 947fa07af13..5ce223267a2 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 871d59ebbfc..354fe9d18c0 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 7d2995a900f..d85e9d8a007 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 38151575ac1..3987e123642 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 a0839e4ad4f..f1baf3158c3 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 218eb6f3cc4..974c13ec6bb 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 36efc2f0f86..6d46e15f37a 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 5c605eb1c0e..a6ba46f337a 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 1a883c34c8c..2952db901cc 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 df15dee6f03..0e92a5be342 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 fb9a2195632..af094f58d21 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 60eb26736ba..c75d6e0b370 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 edb525c6b47..7e48af826c4 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 ac2acb5c16d..ebe331af1bb 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 d5866b5c653..20e27161289 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 197a294bdd4..8d5465671e1 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 44018728315..5067ee64fd6 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 fc9dcba60f3..e0c4a94e7e8 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 e7c518b7214..acafb1eb382 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 083b02f58de..5011acf34eb 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 572609ef13e..eff114e8b88 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 91a02a7e259..7ae8818a384 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 7806cd6b8cc..5a3266f2e2d 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 7b609fcfaab..07cfe6e8305 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 5899bae2cf4..ff23e1783f9 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 1eccd30f8dc..2739c209a9f 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 e816f42f2ad..2db05a98477 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 b00f200bdc4..21129190bc3 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 b83557fe9a2..16202be333e 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 38d65ed44f9..efeb6c3466c 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 2e0051e6893..c6c77189755 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 7d2d5f5e2cc..4089bc72ebf 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 7fe29a48608..2b941dc87c4 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 9c1a3fd295c..6a1844207da 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 271e2d037a3..eb3b4db6054 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 e478cdda96a..04d5d913ba3 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 66c0345701a..1c963100b7e 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 62c7dbceb44..6edab82dc22 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 3d8c6c7ce00..c34fe3581ee 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 008c036b90f..7bccc9785a9 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 dfaaaf941ad..21c542bcbd5 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 3207f66a486..1654d5c6d06 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 a42d21b61cc..67353799fdb 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 2af4c59beb3..2385734d418 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 1d350fad7a7..de4911e3f12 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 e5290f95aee..ec3d44343bd 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 f9795cfd12a..b265b8e5613 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 0ec2956eccf..b2476dcb851 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 37031772a86..309068ede81 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 e6d6710a5bf..3ce2f7b9384 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 a5795a40a2f..200b40d056e 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 52b9dadf57b..a0b7b6e91ac 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 113896b67e3..776d2a8d097 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 4197428300a..328f03f40b9 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 754b5a08581..bdf8815a0ed 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 3cccd98d13e..e90846006fd 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 9c63d45cf53..e1d67a7a439 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 372c1a1f523..cc2844a6e3c 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 aca50f50a5b..6901d2f46ca 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 1b4f2a3f848..45c6e3a3a7b 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 d5ce147239c..087e7594c8f 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 4793ef38e4d..787a73f7185 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 34cfafdf1b6..55d5501d7ff 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 ec5f9e2e2d7..0d734d67cdf 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 3ce913f0c0a..e5b7bf78548 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 e1dd5355c78..c2e5e242b99 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 3c934fb848c..f095dd1411e 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 bb84a36b600..43fb44222d9 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 3b047ec6a90..e1920daedaa 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 62d67414878..bddd47d29c4 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 be7ff90b944..506b5eb22ba 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 a8bcc80bff6..aab545de744 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 fab1822c4cf..63634cd5b92 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 17b728706da..ee6bba85842 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 c6594091527..9208eee2937 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 9f042c35e41..23fe441e035 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 7777dd1b7e3..b8242124235 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 d78f6305517..110b4f9a535 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 444314d18bc..a43dd7e7a58 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 f7320804c04..2d4aefe47c0 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 bf2fc7447db..53e4d4e32a9 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 ab7e8c8ab5b..87c89f631c2 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 ef9dfa9cbb1..1ff45e77a61 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 62830933bc2..4115bdefdae 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 b370ed4abea..9ce759e9e57 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 f1f2346677e..f4a59274054 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 460adef00ff..e55cbf25f82 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 0da1da3ceaf..9f8d20d86a8 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 41c66c14765..e59b04ac11a 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 bc1156ec80e..e9fec8dbafd 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 f5368ff0faa..4f18e321092 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 e79dc1a0e4d..85b27e46156 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 cba0782682a..8ab9a9f6ed1 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 ac350c13ebf..8b9e6eaf24a 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 7e5b977b54a..d050b909392 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 ca6276b3cb0..5f44bda1f1f 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 cc6493560b4..ad2b1dfa9f3 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 6df75b89fb3..49145de8f21 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 4fc285a7e1f..8952f020e0b 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 506bf5ddc46..3d1be9a9151 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 4d697de1538..150fd936077 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 69a15332d97..44398ff8773 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 72696a28fc4..d8d92778041 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 5394b78c94a..2ace305d965 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 9b0a9613718..f7d2b64b93b 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 b52b1d598fd..24bf4f6deb6 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 ee7b90aff29..cc902ebb890 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 81f02fba5be..ece062f9945 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 67550772eb5..502fa225034 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 ce9b21a0861..0c2867be530 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 7dffb2fdd87..c5f933514a5 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 07df0ce6065..133796320c7 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 27de1b970ea..ee6e683f658 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 1cf711e87e5..c4f372a09e2 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 89fe23e51af..846d732b817 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 603ef50ea5c..d466d3b0be8 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 5f64c066e4c..0265a2c0dab 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 472d3763ba1..2e2b4d010bf 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 b903b0f7f77..6ec4fa970ae 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 6350fa68416..7de35d3f757 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 8b77fd60278..461ce9da971 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 a229ca6f3bd..05e631c9bdb 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 bf88893f78e..62b4a96d337 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 e1182227987..28fb12ab13b 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 de5ae10b7e3..e550c68a332 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 aa897947d0d..636a41f8837 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 4af16ce95de..baa1613fd7f 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 f85e496ea1f..6f555f5ed66 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 7aed4acd015..7598be59c2b 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 508a2776640..fc181856e4a 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 d65e82b40ee..2b099643b13 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 aaf9e02c0b9..d047efb06bc 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 7b260171257..00aaa2697bc 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 2e6e336a0a7..5e7da532335 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 cd596dee75a..d258a17e2f2 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 ccc375fdff9..707160377d2 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 1f3d7fe3356..6aaadf849b0 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 88a92bf70a0..dbd61356354 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 924313c4f0e..d95c358d1b9 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 ac81511ab1f..2fed11a6a56 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 c5e37792771..c1f8168c147 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 29453d10f76..6d1d73edfb7 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 73c437970a1..8dd962eafb7 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 fd840877d89..36e80c32913 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 0a378579f2c..ae8a6dc0ce9 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 56b7412b71d..4f0a93bebf1 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 4adcb60a1c4..39dfda865a1 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 750ad118a18..b1df8d43628 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 c001489257d..9a3ee94a976 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 118dc7d1aae..7b194ba233a 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 da53306bbd2..c89ae570fa1 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 3fd3e351d46..5eec8625e43 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 29f2d627dc6..26d9dd26a4d 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 54e9bfb5f92..d0cb0eee200 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 70d1b218d89..2f5ea948589 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 2068b1e89f2..81087465285 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 a536c911e56..f09a1ded267 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 19a4f59a39b..f937ac9c7a1 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 9f784e5cd0e..bb91a2f34b5 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 15f4d5395a1..d70b8108ae6 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 667418d7383..1539cf42b6f 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 cbbcb0b69bc..497151b598b 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 5d6a99cc6a5..104b8a7bf42 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 6f9b4cbf2ca..ccd1891cbcf 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 46686d8469d..62f003f0b8d 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 9dc03c41a6c..5e55bfa5dd6 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 7a45eea32c9..500533dc53c 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 1f14c1c754f..ab60c052a0c 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 5c252012c8f..047c38334ca 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 fe724e4b56c..263743e0664 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 041161f4904..e4cec2d68e8 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 876dbe532b5..f97c761a2b6 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 65d43640c89..17268978de0 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 9e328207abb..47ece120c9b 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 35e42937c6e..c268be8ae12 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 fb667547dc1..f3dc7f0c884 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 8cbf4bb1e06..e5bc79eebcd 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 ba652cf57ba..13bd5cf4078 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 934e41182cb..7a15f4cccc5 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 39da848c903..76192b898f1 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 9fdc9ef3f5e..ee6b5cd7a7a 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 8fae5bb0119..a62702b02fd 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 767e1db7b65..8d4b7212989 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 c0920341593..24059afbaca 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 d78fb99cbbe..a9c321d4a87 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 d3778a470f1..a7487589a19 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 5102bc727c9..8526671a12a 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 1155d215f1b..b891524188f 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 5288b4d67e7..a15c47ba515 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 8c3bf5d2ef0..d683adfbb58 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 655f4a17d85..d527a1ba9be 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 cc3d6d7d28d..83a87fabfd0 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 d1982d4bd1a..879b1a9b819 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 38a1adb56f1..fdeb93fa8bc 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 911829a4f7b..7499643926d 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 63a71269b92..f4fc54c24e7 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 b813846a478..5e0bf52886b 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 22e567e5d9c..1471d169b6c 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 60e8da3697c..2007dd4ef72 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 564ac49bf45..1aa9eb21012 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 5031d352d64..1756e3b2d72 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 9bd03474cd2..a6ecf4c3fd7 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 511dea263c5..e767227de9a 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 55ae4e47b62..f9ceb8f1e84 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 6df6b55137d..9d874acd668 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 f310cb101c2..1cd7c4f61da 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 b2192c975b6..dc9ab652b06 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 7a610701aef..635922f12b5 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 6a056999f28..b859665ec87 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 d3a6dffd26b..cfaa5bee831 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 2e492eab8b4..fe935dede0a 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 9b5c52c97cc..60e0215ed1f 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 05731d7cb70..5d8fc4c0544 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 7198f415f55..895ecf4efde 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 4778509a4bd..b16b870d5ac 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 2f3747c2a66..c34b901b7af 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 cce3a38e3d6..990b8992b64 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 50b3d15f2ad..5a711e75b7b 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 20aa388bb8a..d9a8f7a39d1 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 22b585b881c..6955391a3ef 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 7d78e843fd5..bea719c99cf 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 a895d0878db..568f8a4a61d 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 166d2aef87a..ebb4c572f40 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 4ca007b2881..ae4fb17663b 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 1e27b5f86d3..f96bc5a9bea 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 223a24014a8..9ec4e05d447 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 9070861fd93..46a836d0476 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 fb528693966..fd5409d667a 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 82de677cb59..d478cb7a499 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 6c17ae68cf6..ccd003bd2ff 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 abb3059ff6e..610de75d21e 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 3bd641fd75f..a8d353f4087 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 653f54c15db..4460ae2bd25 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 d786dc46281..42519e9467a 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 3f5b31bb0c7..6defe845cb2 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 c0a2d33e1e0..748138e7ff8 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 db3fff1eb80..5a10db3a614 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 95cd8d5fb0d..baab1871b46 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 174bd5168d7..909a56e26b2 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 9bc0a5d814a..670ab2a35ea 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 22e1bb6649d..614d78f0492 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 8f49b6cb469..c07a71a14a6 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 30276745e3f..b208c2eed2a 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 659331a2eb7..dcd20664c6d 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 b2f1898d137..908c89b3d51 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 4ca2c3acc7d..4c7cd5fdee0 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 fb92e0f3cd5..044cd8f47a0 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 8f3cac9c552..20742fae360 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 f2163f975d7..7ba938c5ce5 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 aaa73249f8f..d159a86ab1b 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 7b32dcc49a3..e63448a4ddb 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 4f035f2f8a7..125b87a1fae 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 8a58b7245b4..a29a5af6746 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 714bd030ecd..a355f4ca1e4 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 64c92db0da2..5371366baca 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 3ee453ebd07..5456908c8e8 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 e4a016e990c..96018c4989a 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 2c23ddc45cb..f90da289a48 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 285fd852248..684918add5a 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 d2ae66345be..83bc4cf1c3c 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 c59f469d0d1..35b94b49846 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 aacf4e615f2..b59536e9f73 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 476c7aa9ff0..5be159ff918 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 4f561dddd68..b97f327083e 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 8db0ddd40ca..f4055c506d9 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 dbbda7df55b..dda05bb9671 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 38e7abae506..e5b6d470abc 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 76f6ae602a3..f5fa8e6c5f3 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 5e8a3804a8d..6795134d62e 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 3905f8b0010..1633f0fd84b 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 49a024a1a5a..d7abe55dc8f 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 e78314a97b4..a525979651d 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 2638ce35e74..9956c754b1f 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 04204c54e8c..4cde6ba3cfb 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 2de341276d0..4155aefb6ac 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 d21876b7ec8..f095528999c 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 4511c060496..8bd602dc2a8 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 407be39cf75..fee09f56a18 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 32312c70e6b..bb3d0df82dc 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 8825eb167c8..a8829557b91 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 05417a649a5..fb9401d8302 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 1993e85cd52..aa3dd8c0206 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 36ed61ae8e5..c022b236e9c 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 bfca73b9d18..acfe03f52ef 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 4d9b9130d48..7e072af01b0 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 14f0ca74eb3..4b722ed77f7 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 6552e3a8867..08384fadd0b 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 c97e4666f84..b1c1503139c 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 e0f6b014e0b..0237e1ca86f 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 632d1c49cde..4b4ad0f5af5 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 478d6e10eed..e1887bf2cdd 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 8b5de46f961..fac663e44c6 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 09e605ddb09..9027c52ebc2 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 1bfb716c1f9..ee168a08785 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 c4b8cd3751b..e92942c0548 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 3c5d082bb49..7b983295835 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 f59a24a36c8..40ebec1b637 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 1f2ad3f3610..bfa8e6e4d0b 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 7995a2256a3..418de0119ff 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 ab5f8419098..2824e3cc2da 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 2f946cdda53..d12e1682e2a 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 4f98165b36f..321425c5e82 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 ebe3cb20767..8a9912c494b 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 477d3310659..6a9544f55ac 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 630e2c35a3b..897c08f7fd6 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 bba7ffe6070..d4bf615c8ce 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 386e66109fe..8378c1b3003 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 3b1c875215a..34bedf6d659 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 a10d456eb22..ac9a8bf90bf 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 fcfb09e4af9..1eb5ffdec27 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 ec64ca80fa3..88a015adf2f 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 f2cee71794f..b533c38de66 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 6c33fadcb7f..dee2e8a4358 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 fe2d1b1cd72..661b2d0e771 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 58c9d0fca59..4ee78abf2a0 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 4cd98b4e2f4..31fe1d61b62 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 5e7a78b2791..b16fa407710 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 bdc30b65a7a..449804d1399 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 c77d63e0179..5bdd9427ca7 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 4d93b32d73b..16131e12693 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 b33f71ca89c..1e3de252e59 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 ef0ee71f67e..e10c15e4e8b 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 bf453f34b6f..0379942cb18 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 b1228079515..b48f4c3bf85 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 d746a5f9cca..6c40027fbd0 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 3860935bf33..b1b0e896f39 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 c9210c71946..f63deb3e074 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 04f2a0d2cf9..e7e5346deed 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 9d0c0f6b601..6973f7ffd64 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 34a7bd759c3..f976aa61de4 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 b280759a703..8a5073f32ed 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 391fd5b961d..e173e71dc70 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 be94b98230b..e04cc7a0e0f 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 9ce39fc21f1..f395e236308 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 a7eac72f7d1..f35917fd4d8 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 b94cc88731b..0ac3c604e94 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 eed485f3256..42cc5f19881 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 5e5f9180d70..ace4c28a515 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 33aa905e3ee..96dd525c15f 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 f923284aee7..acc5315faf0 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 4419db81f36..1ddc5a0a6b3 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 c99a5946d9e..330e19aaedc 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 641eb749107..56e3433fcab 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 730eae3319f..b3c740e200b 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 f1d7f0bd352..86e69615379 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 5b8ab3fb4af..e9847166215 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 3d01c8bbed3..309302cc655 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 fde05f1b090..561717c890d 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 2f446f6c55f..f485dec462f 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 57eb3d4fa24..869f0572def 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 73c700245f9..797dc806091 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 e3d4524b025..e0a477d853a 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 db83c27851f..0e10042c29d 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 6bdb1dbd388..728496c6346 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 3fd0d4c07d3..1e10eb0075e 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 dcb3bbfc3fe..357662ea3e0 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 93874dda041..22e481e60fd 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 4b0d9c7f140..b357d1e6038 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 f14cb84f701..3dfc088d0f5 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 38e768205d7..7f705a8cfb6 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 65b2e51fe4b..e97a07e7f08 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 ea7639ce859..13ca34d725d 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 a3f1f48a317..64b84d90dce 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 e56e60e667d..0787ec97f79 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 30a9003d313..b76d72ded30 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 d328ba303b9..4885be0441e 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 b7a3f4755de..cf3187e47bc 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 2cd79a0a462..f40a20f069d 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 5c4a3e69202..fdcb6e127c6 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 ec92aa0cc37..ee95878663e 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 6e4c99120e3..97f29758371 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 83ec0431b0b..8167e4d53af 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 75875572751..1b71dfd0083 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 a05774ca4f7..1d4411b150c 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 c280958e877..5e388d23e34 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 d02d33b5b2e..ecf4681e1cd 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 53339ba0e6d..b88be2817fa 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 5489dcead78..e32917ecdc5 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 057e3fd653a..1ca21fad7a6 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 b6da9fff271..d60e4181f33 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 103eb55d917..1c4d9a41f85 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 a4b2a196900..3001fd44035 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 023ee60d926..fd98fe1721e 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 c09a08668ff..65761d7f5eb 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 9547307dfc4..bb030381987 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 7d13215d4e9..ff9cfd0da25 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 43e2ef57c2e..9ee24ec7368 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 d3500e92b2d..ef3b72ae3fb 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 dc6f7d40a58..a0ad14b0743 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 ddea89ae271..b89dacc55b0 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 64f3a85c4bd..fc02094407c 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 af04346a436..fe20eb8116c 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 ba1e1d68b0f..e889d4f8ee2 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 e234a4eed85..ae7e4d6294d 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 4c10ab9ec8a..4b5a05596cb 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 fc81a7b3ca4..a6a1d8c99fe 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 260e1e825f3..64984b1d6cc 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 78846a421e0..239b20dd24a 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 8475d4bccba..0366de390f1 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 d3040b8c903..e89d759dd2f 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 123fc74c56d..6ece4ef079b 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 3388b3aafde..d5f37b02e91 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 cff9c6c928a..c8cf77e4e7c 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 a02fa4e3409..3c87d295bc4 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 21bc9f2fdc2..e8229a4d518 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 b25c005f535..71ddcc7e97a 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 2bddba4b9ab..0a99e241058 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 7a04f18b047..265147b728a 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 b1d4a90708c..1e5c31fd811 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 e096b638865..e012c7f12bd 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 6a45e437cc4..e79bc1c93b9 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 f9a68cd64a9..dcc3724aa43 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 25f26f308b8..ac1cf7f9069 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 00a00563306..483d6c92af0 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 0dd85c835c0..dbf820d06c5 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 340936d4c3a..162038aafcf 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 141a9101456..5d9af88b532 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 a604c876854..0400b8542fd 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 8e763946d3b..fccf25feebb 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 2e21d7ae620..da96341795d 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 ff5ca3dd93a..7b433b33c12 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 c2922029b79..83332923020 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 f645a6a8339..418101789d8 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 85b90bfbeb3..242f240b3b1 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 554c91958db..6c3107cdde1 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 0923dd3d8cb..5f4ef5519fd 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 4570c5da829..c13a10f395f 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 49a5e6a2a8b..ae09bf3fff9 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 7cec9f00b74..235959254fc 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 e66caccb30d..fcc869948ee 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 ef85065b868..8c73e18d791 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 96fec081e33..1df807014a3 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 2652e7cf632..123fa418e60 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 90f2012e67e..1b943d2dcc9 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 c0fb481aa53..f5ec79b4533 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 b4ddb3904c6..943700a0c6f 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 45b452b87fd..09645a8d40d 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 949086250a5..1db4799c86e 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 ccea6a1b55e..1ba08c87629 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 8097234fb63..1f330d63176 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 2f0db5fad64..49a688ad7bd 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 57742b073c5..1da3a93ee0e 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 8bec1231688..26772554768 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 54d151a40e1..d6fd37d426a 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 4bc00deda2c..1ce10f83fde 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 3afa5cb6821..703ea9df2bd 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 9a36f3b6dcf..fc1ba2f4e21 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 80b1d58d707..32c0fcc57ed 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 54c693a3779..be158be934f 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 2d88138b23d..fbda8a5d128 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 62bdbb4d268..1c8be1bd100 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 187d66ce35a..0cb1f12e0b9 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 379f8c5ef8c..19431c9dbff 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 db61b0acf68..f3a446595a0 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 be16e88b55b..30b6230b035 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 616fa5f239d..5b64516402f 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 0cafbd0c9f3..6494d379fc4 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 5134ef131dc..8700ff4efcc 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 d1d20445f87..623d8fa3dfa 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 6b408c2d60b..a365ef9312a 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 40adcc588ad..f4e9db30806 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 d254d61a053..2340993b9f0 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 2bea7e92d35..533f078ca78 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 069e4e3d542..a93b2836aa9 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 f95bab29791..92a72eb474c 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 ae95dffcce4..89fa1a6311d 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 cb25e4e13cf..bb5ade1f778 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 29d4fc2088c..c1abc4b0c13 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 26dd0ab4a56..3b90ec039ea 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 828cbcc3715..614f109150f 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 8a671b45f7e..7671a3baf1e 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 8d370aa49ed..9ab1733c0cf 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 f34dd69022e..39eb9c6d679 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 dc5da945a9c..9b705c560bc 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 dce6adbe017..8c58242179e 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 ecfe3f69edb..898458679d6 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 e1871176f8b..a3f19c830ef 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 78255726c44..a7e6bf3d2d1 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 b9b8f3eaf79..f7521237ac4 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 b47bb1fee25..9cb6f5f5418 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 cef4cbdd3e4..dc51400ee16 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 44d6bb5f520..68d1d69fa6a 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 81e72c245d2..d8db4e118a9 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 f7cb2dd1d71..372e20dd192 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 f5bbda07897..b2521bbb260 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 bb0cf74f54f..793af7f9fe7 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 587ab95d585..903fd2c1740 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 705672a1373..1e3594d90f3 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 1aa6594760b..c02dba5b139 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 9fd53fd0730..10b34537293 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 8e6a175df44..13bc58ac634 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 38f95e05b7a..d2e60bdc3f8 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 999e3d25e2a..ab2eb93e8b5 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 103c91e11e0..b508397f5a0 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 740d4f22198..6a72bfe67c9 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 643a33aa291..95e798bbb59 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 ae758efb1ac..0c45d691d16 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 096ac39367d..4b7d185024a 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 c864be92726..411d84976dc 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 fb2b36632c4..26cf4cfb4a3 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 aae672c9da5..8e15586abc5 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 9188d20a910..cee975f7fc0 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 e879d74c4c2..27d98cb6b40 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 755f42eb1eb..9dc08805f20 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 6e191ac1dbe..73c7c94de93 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 f70fdaa8127..a79a53e39a0 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 06c9c63da38..247fbc220e8 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 b64b6aa498d..433099ab740 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 0cb8c843a9f..2574a27cb90 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 91956239269..d2fb832a9aa 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 7fa6d782e0a..15f40f2241d 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 2739f7ca773..456ce2292c8 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 ffb8a7d3c55..6539cbf04a6 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 3654ae63822..4b31480183c 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 d96b8708407..4caa1d029e6 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 146a53de09f..2eccb335165 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 4d1e3d3313b..8f022de5263 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 82e5d93f5d9..ed124cf2a4e 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 7f3959d2e22..48fca503817 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 ee2de0f1bc2..15f3333be62 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 d1c2cead9ce..fda053b2ff5 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 08536dbdd3c..bfe642b2f61 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 a823e870e1a..ababad41753 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 2b4e9a86e91..0c58f4a45bc 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 85f33f14aaa..76858f05d39 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 396b70dbe57..0c32e5ebad1 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 012fcb9ff34..decd84fd454 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 ca8b2f17122..6b5561a3e8c 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 c51f8b3c2d2..9cf9b775e4d 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 fb2f013489a..327d545852d 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 e27f2a597f2..8d09721fc9b 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 73a29b229b8..1752d9edf68 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 f6ea9855094..df0af2d6972 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 669429d0317..27b63394589 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 ac7989aaf85..75f98e1c1e9 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 2741e320713..5b112daa2c0 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 d2f35661620..aefa4fdeeea 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 9e00baf892a..551c2b1d193 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 9178582be56..0b2bb38d1dc 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 41b1c4e8fe3..54430340998 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 6dacb5b7efc..2f11236acf6 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 620b484484e..a86bd49b259 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 4b7ea988d1f..f09ca28c393 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 6cf5b1074c2..6c8e167c83b 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 5da477d34e4..762f099bf60 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 5797247790c..a1fc3a00417 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 21426016ded..1ba5aa29ed0 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 24be8d9a8f0..d1d641c86bf 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 cca17b28d2b..2900ba6a12f 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 dd1c75d5319..aa83869a284 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 19cc85c9ade..cccb8f3be67 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 bec9bedf433..4c2091df2fb 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 71c1fd499e4..2a1126f027c 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 b860ac54333..b71c675578b 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 3c3b9cd9148..80be33ea367 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 2413fca1c1a..e0f4fb5d3f0 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 d96108a12d6..0c68d56546e 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 8ffa4def9ae..cc70ffb79b1 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 7e89cf4ce92..61dc6287b72 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 712ecae72aa..8cfb982aa54 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 a962baebfc3..5fd9695995f 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 f5cfea8d29b..42c31dff6dd 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 2b02cc21365..5690b3f7c28 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 05d77dd53d1..330e9e3e70d 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 7dae9683dd1..d2912845bbe 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 e6e61907a84..024938c4417 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 ca1706db694..7ae2b9399ec 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 b5a1b328b04..4d7488689c4 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 eb6579cb157..acd43b91d93 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 33cb51cb698..320afb6a45c 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 2bed32616ec..fe15607c92e 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 7597f6d2efa..a20ed770fcb 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 9372985ee76..e5b22c5feb8 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 6b8918a268d..1fcd6b1e3ae 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 14943b9a4d7..c98ce2eb51e 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 cd0e5d373de..47842bf5685 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 fac3034887b..3a48697bc2c 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 33e124d2b0e..c510e5413d7 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 a284787d76a..fd441fb19aa 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 611c162c57f..5a3f495960e 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 f2d1b53edf7..3d6fd0ce725 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 3d09e830afd..b5daf66806a 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 45b7bc7c87c..001a11b75be 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 47508d8cc09..7e2ef787ab3 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 05e5806e4d1..3c671257bdd 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 894dd3e93a9..679f139220e 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 6fb6dfdd39c..eae1df7098e 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 2ab03af6cb1..05c4b287027 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 38a78251422..605e6a49a46 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 6735f57df71..93eab8939f0 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 dc7238b9c57..253ba7252ec 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 e4adc6d4347..86cd9cb66a4 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 8c463547681..7fa49dbb9da 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 a7f2a8e336e..29653c84bda 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 43e94f74410..73b7cef7543 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 57377e03c0d..7236248e3c3 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 6ad89dbfe03..d59af482f9c 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 061de54ec35..7402794d6cf 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 4511d7bab3b..30f71dfc529 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 6d7cbb378d0..5e80faf6972 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 b0376857536..b2c7d20c3af 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 6c3c795be02..ebdd0bf20d1 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 c637cd1892f..8305e306f02 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 645ba3bf2da..1bab0ec6316 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 09503d67173..062b3834a5a 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 a20f287b245..6e85a4e848b 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 dcb305aca54..d0bcca22c9c 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 4eda7d4113e..ebc07a51a30 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 9d81a735d38..721e2c720fa 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 8ec18e2a8de..553987c8a52 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 8a22d8df716..c296eab903b 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 d69d39c375f..8f3c0b9b515 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 2b7dd0b80bb..ade18dfcbbd 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 6cfef9e7957..16e40f99651 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 e8605fcd555..327af7a2e47 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 c1ecd79bc31..cec48c67c6c 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 8b83cdb5262..f0f3f4bb5a5 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 e83ba52036d..2acb22480e2 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 8d1b7f5d85c..955373c266b 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 a28e1e8c871..5debd0e1948 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 43c990ce4b2..bbd0619c7db 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 e78e706113a..e22f207c31a 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 efd4cfc2931..c3f9b37fc28 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 166fdc9efa0..6de2cc66110 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 1574d7adacf..85c64688d44 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 f85e5f8a125..376232c1bdc 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 1e2b7e426d1..a9d2e2ece4a 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 97d02941f8a..85d415cd7f8 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 d84060c062c..55ce8a3e6c2 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 b2ed317d600..ef708ab4b8c 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 9cfa2405173..a091a109a48 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 91151ffeb3f..91ef2238b17 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 179afe1b990..4d30ca4de19 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 1c346a01b0a..b2afe602769 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 ac6e8c4ea5f..10a5ef21850 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 4db584228af..1fc930329f2 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 29f81966815..326b145f6cb 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 999730b1602..e3487521016 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 43c342318a1..24fe5a71028 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 dbcac325d2c..383e04c5a25 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 5edb098e1f9..25b0d8ad411 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 48f5e13ed6c..f0b57ea3f2c 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 b0e19aa6b0e..3bdcb8be11e 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 7f281d9b303..857ec455fdf 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 381e30bec68..6e1dc0d383c 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 b8690edb832..6872a5e03e8 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 1430aa5a5dc..221531a9b91 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 e8af364fc13..d9631c808bf 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 47422db53c8..3a328c6183b 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 0be41d278cb..8c22311898f 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 7157bcd8f1a..754378ceb06 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 e2f6badd467..ff9c8ada747 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 0c73b81ed85..6676f303334 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 4f6f4c1c7d2..0336640289c 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 d4c78667dc7..83e202b0c9a 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 1687164c7c4..a466b0eeeaa 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 708d82c867f..bc2b9dfbea2 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 181a072277a..3d9e00f9310 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 0677afc9299..28f600a8e5f 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 3078c568884..48d44a5c8df 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 07683110f2b..d7bf88ab2f9 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 85a0aefc821..1cf6b379b46 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 ff4674e6840..4d954544edf 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 26ce75f437e..486a22b7c67 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 dd8509f4957..118c0854bab 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 36c3fc78abb..f2293d14294 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 d1f1aa5c362..0ff5efc1b62 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 a2cdeadf504..041954419d5 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 0ea79c2872b..d3562d2d0e3 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 d6b21593a04..4c0256b3466 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 3a3bd7729d9..aed63c3bffa 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 8592e59ec96..2dc94176be4 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 87628a0246a..3493b973387 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 8b0951ee848..7e53d2dda99 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 04e0ae06d7c..7c6b2d6d9ec 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 a924e08c458..b736163ce4f 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 5d65c0d8185..c121af32721 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 1db293babdd..015f5b4c6af 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 17b8eee0435..9da5bcc7fc5 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 746b9242a9b..31a6628e17e 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 0f48b5c7d49..1c20456b172 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 7da53886126..5d9d4c2efa1 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 d81710d1f37..2dc7ba75c61 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 b72d63d3dde..b9a254461d6 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 74a6679b84c..c654a54c62c 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 173e0f9f481..82a472c75af 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 8e557ec1e2e..bc63d99732e 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 9d0695251c8..d17f5cd7802 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 e02551c4a68..f7a65768406 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 e88551b4c9f..67037bb2aa5 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 ed3f19f98c8..478da1da4a2 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 6ba583989d8..695949fc641 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 d0ec101a86e..38e39587713 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 dbb1af70130..266cfc3a869 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 0e1d3ef211b..3897c0823de 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 58cd1583072..ad966118e68 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 a43ea4af4c6..c1d817941ff 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 fb1b30a8c09..5d69ef5bd1c 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 05fb00aebd7..8fdc190223f 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 8a8b6e9c068..677597e8bbd 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 5b37796bd7a..2350a1e9887 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 670b408ddd9..a4690073a6a 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 90950e2e457..2cbb05410d4 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 8b8bc16681b..8e2471a6826 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 3d746ad517f..ab2250ed09f 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 3a05dd233b2..c94f6ba1682 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 41a12b70676..2e811480b98 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 fe6f4066dc1..ab018599f27 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 bbba17bb189..e84710cf280 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 b0ddd4b130d..3d5a082354c 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 f2ece94de14..e5b3bb8da21 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 59056eee10a..d387bfb1135 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 c8c01d8e521..043e2c0eed2 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 9d671d8c1ee..029eaa7e5b0 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 da38842a7a8..cc123bcf209 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 2369be3022d..fa771cf0e6a 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 bde7a9e5dca..055dc6eb019 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 d8ad3ea29c9..155948f1839 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 4d80f5d5b49..e4e3299e5fc 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 7dc71e66761..d656ab424aa 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 fef2de2a7bb..9bc3c1229a6 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 8f9baf8cb7e..71f654da7f4 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 995e0e000c7..e094b359747 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 6e8ada08361..a7f1beab162 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 f841debfbfd..f7c146992fc 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 401ccffadc6..87226c2036b 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 f6710273e86..67f25d86b92 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 920461807d0..fe6eed4b85c 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 214a0e142e9..b5a84de2e99 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 db0bd46b9ad..594678ff384 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 eae964b3323..7ba53a6c6bf 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 344831b9505..21775ada5ce 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 505358a0f3a..7fa1eb5caa9 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 f8afd921e0f..b5e7bc5e331 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 7cd53139ba4..500dff2c0bd 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 582bdf13217..392f8ed9df8 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 b68d888e01e..65a724fe139 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 250b3707187..bceed678a7e 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 998baa9a3a3..8f0f444214d 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 8800644f095..560d02da059 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 22fd121d402..ade10ea7340 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 be1fa6511d0..eea6d1ac23c 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 17db4724f44..fbe64213adf 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 2d07e9171a2..61a3926e83c 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 1ae99b00b7d..7868ab7c447 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 c72c8f95eaf..f53dde85b85 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 4ec8eacd5bd..24a760933b9 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 d448266477e..0a20b6d01e2 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 981dd4ec434..73720178565 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 1af5354e0c9..3c9e2981e8e 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 c10608a23e4..87ba4211feb 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 c0bb9f64c16..4f06f715610 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 18d7f0b68e6..7d35c352d70 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 64aa5168670..14ca8632ec8 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 4e588c7fc57..bbc1269a63e 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 25433d8ae93..5d665fb4dc6 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 c12ff7ae763..ecf4c2d875c 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 57a85f75418..bf21cd9f858 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 52cc17ec6c2..ac72919427a 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 54497f8766d..ddf0c002cbf 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 987dc72902e..62e80e27ccb 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 bc726b4b117..80c99a60cb3 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 e650f41e7c1..f562dfd653d 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 1e5921848cc..e89a0cc3869 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 5dfbd7d3659..ced0540138b 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 17e7ec5288a..7c1ee808127 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 fc35fd29f13..5be07d5e781 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 fa41228fdea..8485f5e8e72 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 d0f4a18f123..a1045d6a591 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 3aa654939e1..38c420c9e29 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 c78682b76ad..bd31c1ced82 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 1b5712b40ef..cc89ab51267 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 f41ab686c8a..2a998d3dfed 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 55dfefd5800..32d8138781d 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 9902733c063..6e719a4ea5c 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 a4be90cbc12..75e6165a6c6 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 c2e7fd2ef36..85a3e579d50 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 557c4f9417d..3ab0860cbce 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 8a9efb06e88..e3f82bd5f0b 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 a22c50bfa98..d12af6804ec 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 00334650625..c88e1368185 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 46fe8d4ba5c..d2eaaecd45e 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 607f71cccd2..b7950b8b2bc 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 17d180c2c08..0e20f1901f3 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 70ff79237af..f94b3842673 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 0f26a6f7830..86108f84a5c 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 7b39b36df42..cce4908b121 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 0fd564f6bde..8833dd4b329 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 7dd8c1ddc98..c4a4d9904b2 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 fd915e80b0d..d10a75d65f1 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 bc4d9cd4757..717a3f267eb 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 e8915838d4c..b0ba7be733c 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 88d6aba2f98..12d7b91d1bd 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 f5083a646df..300aceb5e79 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 7c590f2c50f..b19a77f4ca5 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 aeaa7c7cb2a..0b047a9b650 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 19b3db96d28..3b9d69a3300 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 74e3172b812..78f178a124e 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 735fb7a3ae4..0290dd8ed55 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 98c5cb1bbe2..cef73cd7457 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 ed22135ae59..1afa669bd6e 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 ad4ee2750c9..bdb2707c9ef 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 abc7ef83f10..d9f1b3948d0 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 d16a292d865..547e8360e36 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 ca93380209e..2280e4e4599 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 3a2f90b93bf..6417dbffa78 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 68600628a71..3060f34c5d9 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 c57be57f131..f64b20cf9d9 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 0ac0508a009..fdc4c4c0e5b 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 eb0e065d34c..5d6a6657e40 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 fd980af47f5..0047f11804a 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 a77cdcf8469..d2683be4477 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 cf370d2c98c..be7e7a10e4c 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 4bae3a6ae7a..f7e1ab1e648 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 4b6be5a9941..dac75894f6b 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 7578c391655..7f93b77767d 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 dcf0be8e8c2..429ad14d59c 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 1223f8cf044..d218d774a40 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 70d333112de..49bf9500f52 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 e4031e74da3..9b90e6f44fe 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 f396bcff99d..412065936d0 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 41e6a65ab8c..3a90ac826b5 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 1e0bf0c4272..a57dbcc82ce 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 351a434c57d..4964b9a5b90 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 0982ac20095..21f9e6f246c 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 fb55c2d7e45..b2025a6141e 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 9c50cba3662..127dfa72a9c 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 8857a63509e..b8aea6f9eb3 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 85e640f4f7d..615aeaa9e68 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 ff768d80729..6f03017a4e1 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 22f3dfbd0c1..d58e30a0dd9 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 3918c1d23c1..511da71bc0a 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 fbf66ca1ac6..43c5e4c589a 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 9bef2483df4..a88b9e7a5c6 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 d14afe7f0e3..171da5b3712 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 5a8abde5eb9..aa524442d9e 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 e7d016b557e..effd57ae586 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 81261ef513f..dd3287f251c 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 fa616f151c7..3a43d45f4b3 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 8067e3c4fc2..ec059ad3d53 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 62154d6ab0f..d48d85d7678 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 61dd919f9cf..fcecff66805 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 6aa10ccf5e7..1c00316a03d 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 358155f1a51..e93b10353d0 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 25d0b997ad7..52339735d89 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 a0e43656e9f..c61c14104ba 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 b3533ee6c05..5ce198355ee 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 d4a8d4df009..8eb794e26ae 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 1593b7005c6..962bb889790 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 7cc70ca9f7c..ce62cec6f33 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 e93967040fa..e8ba1bcf856 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 a2c6169de53..43c1b2e2759 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 3e2ddb2a93e..8ae5bc20a8e 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 afe1f93e703..2c7e8e1c823 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 5d77afc742b..1531024cef2 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 8a5fa10f190..ea600611151 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 1c8eed49e17..fbafa135e6b 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 532b415a227..5bf131834df 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 27c0996c194..b83b6158416 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 dca5af78048..351fc6c0cb3 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 04427993a3a..0d6eb952c81 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 3e09c6d8c1d..3d4ec6fa73a 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 98431fbb5a5..1f8e0b66ca6 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 a11977ba5d0..44ea8f3f4b8 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 bdcd069c9da..98d4e5cdb82 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 dd21dad1357..4dde5861ae2 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 651bd4f2afe..543072f2f88 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 b63771ef639..f3006fc3a17 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 1e41adb0185..d9704bd060d 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 f434c01e067..a49f6654d35 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 15994f8688e..17a2e771abb 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 287c044fb81..442df446c16 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 09df809c082..56c9fc02f04 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 980f138dcee..2c49b70e060 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 306ea613c54..5601410292e 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 91094bd6bae..cab522ed154 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 a33b02e111c..46d971b522c 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 412215a662f..a1ef9611c67 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 4fdcb8fb430..5d7c6340e60 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 98790ac2dcd..4d5acf855b4 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 c0e5ba22712..afaa1a773b3 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 489587b2412..08c8831955a 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 9ef03dcc247..6876130588f 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 cf012709c92..0a46d1811b7 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 863db3d64c9..21ee35db3e8 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 0273372f1bc..a00056d8cc9 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 b1e5a2c6992..bd32b2982b4 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 1e145a7f94c..72c5df4acc1 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 fe7f27c9cbe..297ab2997e8 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 dab3f97fddc..84bc45dc351 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 5bc36401c2e..21994dce783 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 aa9f354bccd..c02348a2a02 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 8a1054b2770..c0fd9133059 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 b5490f3d0fb..320b96deeaa 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 57104638a65..4033cbb773d 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 db0c50af73f..095675578e3 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 0f4f6a89a69..343470512ed 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 5fc26c92b8d..79705c6c963 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 16617d5066c..3349cbcecaf 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 a04413ff613..a5a37afe96f 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 8c4cb3a7c9f..6fbd90a015b 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 f72b7f430a4..4d3c6cb8806 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 c22ba47352c..4119ade3720 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 080cfd81201..1233b8f4617 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 2fa20d80d93..bfd8a421365 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 348e1676cee..1b3e45811cd 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 12ac10c8c15..6528c938135 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 57f34b60d8d..9e684210e47 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 dd2c6a16bbb..0ee01f087dd 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 8cf6e1a87ec..f25c0ba05c6 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 83afc19266e..de58a459e0a 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 31f54459892..53900f5011c 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 36d2ae5324e..6ea0d1f8edf 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 c3e688406d8..cf24e5f99fe 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 b945b790fb1..6744c57cc54 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 b0e9c886fb6..aceb6d7bd3f 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 20c95b444b4..d235adea09a 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 392811c9dff..321c86b0c01 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 d574d28b691..cc03033beda 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 4d137dec8d9..7d259a8d74c 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 26d014ee09d..e837f0db60a 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 5b9cd1da1af..778e79a6dc6 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 38d13f25e81..712d7098130 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 c97249ad297..9a6ef8e35f0 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 54c2ee9ac96..f518994bf2d 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 1cee5ca224c..0147ece563b 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 89e3b89c9c0..bf26dd32758 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 0f91f71fe7b..7dd6261076f 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 bc9d73bcc70..c92a92a5268 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 37a92b96098..b73ebda71f5 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 8bb08718a4c..4d4b2f96f8e 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 4f332b23017..23c42df6fff 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 6108cce499b..958dcc9735a 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 16211dc940f..93e62f2d23f 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 d9a2737d3f2..8692cf64dbb 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 652a41b9682..021a8ee9ed3 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 2c8fad031b3..65aa26c9353 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 10bf73ad93d..350ff3a9ce4 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 78d8c47f0f9..48d41cdd2f3 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 8ea052bb0e4..98b22d3b6a9 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 735aeaa3880..c88713cf652 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 e9d39803108..6ec4c115acd 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 a8e572d44c9..9e5ac1b0caf 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 c8bdc290a4f..6736a52ce10 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 da06268e1b4..d888c3e8db5 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 55b84c1ffda..6da8f518386 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 79bd892e88b..9a101fa504a 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 39f98face24..2cc29aa790b 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 bc653af694a..32969ea0e25 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 0470799d0ab..b518b879fcf 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 804422c6a97..cdd5b01a96d 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 32aba9a62cb..b59c8cac488 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 b1c24c20465..eaaf18e6987 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 c00fbda4f99..b3f98ba53b2 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 511b73d6454..078f6aadba6 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 98f426ae9d3..8866efb8100 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 1b993802013..c1aae00d7ec 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 cd5f1da07c1..fbea7e2e873 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 e324bb55696..3502bd761ae 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 b599f666381..63ead684d09 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 e3c52175e81..ac639bbd989 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 4bf1b76e337..984f60683fd 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 b7e0135e327..7608529ba78 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 f8af0c85b56..0896574e284 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 8bada5560c7..1804a388db1 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 2caf203d6df..3d67e1f2d44 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 e4fc4cff715..10956cd0862 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 60dffc01d20..7590af1abee 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 10201d866af..5cda89c904b 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 3e5fd2566d0..c08a60f7a7a 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 8210005cc09..8363211a328 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 0d47d24ebb1..7f938a68ada 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 c8bb96a5dc7..d210804eb70 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 286d2544a59..e803850898e 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 50eeaf6b39d..6f237be0bb5 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 ea034f3fe27..1b1619aafd6 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 628f5f462ba..7a56e013c14 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 44d4542a99c..ab669720e44 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 9b446269165..02db811b144 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 15728fd6877..98f6cc3fd52 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 60b57cc73bb..4d1ffbe76c0 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 5c7d98b1974..8004005912f 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 945d7ad3921..7d713932691 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 9049824f723..79dc7751d41 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 748b57bae73..7775e4fb098 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 5f01d6aa302..de61bfa40d4 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 fe12fae8538..dbaffaa982e 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 bec936d46e5..7585affef1f 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 54b7b0496e2..d3ab91a7102 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 2626df17ecf..8480b99d00b 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 d056d4cdd89..c25ffdeaa07 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 96da967f4c2..27ba86aa4db 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 0550c64d311..d7c83fd8c29 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 fdf81ebcbe9..84eff45d570 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 6ea9a9d53da..3cbe9156b2e 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 694ae0f7367..709196be261 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 edc55f19aad..e0ca69a5951 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 904f59aa0a6..39bcb1364dd 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 1902da8ae4d..4b8df747ffe 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 fd286dddb45..c60592981b8 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 9c06734cbbc..9414895631f 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 4090f8a0447..7259721bab9 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 58f3c28afd0..4a6cd8a9a87 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 d62fe9a3a52..2e8efe4c253 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 d0c497695bc..9cca30074d1 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 9473825d537..ac453a50dba 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 cf1a1dc743c..1bfbb1bc7ab 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 524b5f00dc7..cd946e48c6c 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; |