diff options
Diffstat (limited to 'src/plugins/debugger')
144 files changed, 627 insertions, 627 deletions
diff --git a/src/plugins/debugger/basewindow.cpp b/src/plugins/debugger/basewindow.cpp index e23e320824..2db1971020 100644 --- a/src/plugins/debugger/basewindow.cpp +++ b/src/plugins/debugger/basewindow.cpp @@ -37,10 +37,10 @@ #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> +#include <QDebug> +#include <QContextMenuEvent> +#include <QHeaderView> +#include <QMenu> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/basewindow.h b/src/plugins/debugger/basewindow.h index b01ccdd584..5b42fad78c 100644 --- a/src/plugins/debugger/basewindow.h +++ b/src/plugins/debugger/basewindow.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_BASEWINDOW_H #define DEBUGGER_BASEWINDOW_H -#include <QtGui/QTreeView> +#include <QTreeView> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index c060d94308..815424e5be 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -46,9 +46,9 @@ #include "modeltest.h" #endif -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimerEvent> +#include <QDir> +#include <QFileInfo> +#include <QTimerEvent> #define BREAK_ASSERT(cond, action) if (cond) {} else { action; } //#define BREAK_ASSERT(cond, action) QTC_ASSERT(cond, action) diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index 2c6860928e..8c167ac094 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -35,10 +35,10 @@ #include "breakpoint.h" -#include <QtCore/QObject> -#include <QtCore/QAbstractTableModel> +#include <QObject> +#include <QAbstractTableModel> -#include <QtGui/QIcon> +#include <QIcon> ////////////////////////////////////////////////////////////////// // diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp index dd6706d417..9296365396 100644 --- a/src/plugins/debugger/breakpoint.cpp +++ b/src/plugins/debugger/breakpoint.cpp @@ -34,9 +34,9 @@ #include "utils/qtcassert.h" -#include <QtCore/QByteArray> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QByteArray> +#include <QDebug> +#include <QFileInfo> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h index 36357d0de3..c718c2531c 100644 --- a/src/plugins/debugger/breakpoint.h +++ b/src/plugins/debugger/breakpoint.h @@ -33,10 +33,10 @@ #ifndef DEBUGGER_BREAKPOINT_H #define DEBUGGER_BREAKPOINT_H -#include <QtCore/QDebug> -#include <QtCore/QList> -#include <QtCore/QMetaType> -#include <QtCore/QString> +#include <QDebug> +#include <QList> +#include <QMetaType> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/breakpointmarker.cpp b/src/plugins/debugger/breakpointmarker.cpp index 1bd674094f..962c613889 100644 --- a/src/plugins/debugger/breakpointmarker.cpp +++ b/src/plugins/debugger/breakpointmarker.cpp @@ -34,7 +34,7 @@ #include "breakhandler.h" #include "debuggercore.h" -#include <QtGui/QIcon> +#include <QIcon> ////////////////////////////////////////////////////////////////// // diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp index 14c605bcd9..e2cf6d60fd 100644 --- a/src/plugins/debugger/breakwindow.cpp +++ b/src/plugins/debugger/breakwindow.cpp @@ -43,12 +43,12 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QAction> -#include <QtGui/QIntValidator> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QAction> +#include <QIntValidator> +#include <QKeyEvent> +#include <QMenu> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/cdb/bytearrayinputstream.h b/src/plugins/debugger/cdb/bytearrayinputstream.h index b85a4e3d5d..789497a7eb 100644 --- a/src/plugins/debugger/cdb/bytearrayinputstream.h +++ b/src/plugins/debugger/cdb/bytearrayinputstream.h @@ -33,8 +33,8 @@ #ifndef BYTEARRAYINPUTSTREAM_H #define BYTEARRAYINPUTSTREAM_H -#include <QtCore/QByteArray> -#include <QtCore/QString> +#include <QByteArray> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 55e45a7ef8..2a46d1c988 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -77,15 +77,15 @@ #include <cplusplus/CppDocument.h> #include <cplusplus/ModelManagerInterface.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QDateTime> -#include <QtGui/QToolTip> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QTextStream> +#include <QDateTime> +#include <QToolTip> +#include <QMainWindow> +#include <QMessageBox> #include <cctype> diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index c0194c5332..2f6a8421a7 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -36,14 +36,14 @@ #include "debuggerengine.h" #include "breakpoint.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QProcess> -#include <QtCore/QVariantList> -#include <QtCore/QMap> -#include <QtCore/QMultiHash> -#include <QtCore/QTime> -#include <QtCore/QPair> -#include <QtCore/QList> +#include <QSharedPointer> +#include <QProcess> +#include <QVariantList> +#include <QMap> +#include <QMultiHash> +#include <QTime> +#include <QPair> +#include <QList> namespace Utils { class ConsoleProcess; diff --git a/src/plugins/debugger/cdb/cdboptions.cpp b/src/plugins/debugger/cdb/cdboptions.cpp index 978af61f2f..46e7ac7beb 100644 --- a/src/plugins/debugger/cdb/cdboptions.cpp +++ b/src/plugins/debugger/cdb/cdboptions.cpp @@ -32,7 +32,7 @@ #include "cdboptions.h" -#include <QtCore/QSettings> +#include <QSettings> static const char settingsGroupC[] = "CDB2"; static const char symbolPathsKeyC[] = "SymbolPaths"; diff --git a/src/plugins/debugger/cdb/cdboptions.h b/src/plugins/debugger/cdb/cdboptions.h index 6405899d29..3e8ed9af63 100644 --- a/src/plugins/debugger/cdb/cdboptions.h +++ b/src/plugins/debugger/cdb/cdboptions.h @@ -33,7 +33,7 @@ #ifndef CDBSETTINGS_H #define CDBSETTINGS_H -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index cfd7edeaef..703ce95717 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -39,9 +39,9 @@ #include <coreplugin/icore.h> -#include <QtCore/QTextStream> -#include <QtGui/QLineEdit> -#include <QtGui/QCheckBox> +#include <QTextStream> +#include <QLineEdit> +#include <QCheckBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h index b010777c6a..0f4bf4b229 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.h +++ b/src/plugins/debugger/cdb/cdboptionspage.h @@ -38,9 +38,9 @@ #include <coreplugin/dialogs/ioptionspage.h> #include "ui_cdboptionspagewidget.h" -#include <QtGui/QWidget> -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> +#include <QWidget> +#include <QPointer> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp index bff8517685..b554938cb6 100644 --- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp +++ b/src/plugins/debugger/cdb/cdbparsehelpers.cpp @@ -41,11 +41,11 @@ #include <utils/qtcassert.h> -#include <QtCore/QByteArray> -#include <QtCore/QVariant> -#include <QtCore/QString> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QByteArray> +#include <QVariant> +#include <QString> +#include <QDir> +#include <QDebug> #include <cctype> diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.h b/src/plugins/debugger/cdb/cdbparsehelpers.h index 211abb9ebf..ea052c9b9e 100644 --- a/src/plugins/debugger/cdb/cdbparsehelpers.h +++ b/src/plugins/debugger/cdb/cdbparsehelpers.h @@ -35,11 +35,11 @@ #include "breakpoint.h" -#include <QtCore/QtGlobal> -#include <QtCore/QList> -#include <QtCore/QVector> -#include <QtCore/QPair> -#include <QtCore/QByteArray> +#include <QtGlobal> +#include <QList> +#include <QVector> +#include <QPair> +#include <QByteArray> QT_BEGIN_NAMESPACE class QVariant; diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index a25af57887..4718a1cc9f 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -43,8 +43,8 @@ #include <projectexplorer/projectexplorer.h> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> +#include <QFileInfo> +#include <QTextStream> using namespace Core; using namespace Debugger::Constants; diff --git a/src/plugins/debugger/commonoptionspage.h b/src/plugins/debugger/commonoptionspage.h index 1eb06d2486..6e683af4de 100644 --- a/src/plugins/debugger/commonoptionspage.h +++ b/src/plugins/debugger/commonoptionspage.h @@ -39,9 +39,9 @@ #include <coreplugin/dialogs/ioptionspage.h> #include <utils/savedaction.h> -#include <QtCore/QSharedPointer> -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QSharedPointer> +#include <QPointer> +#include <QWidget> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/consolewindow.cpp b/src/plugins/debugger/consolewindow.cpp index bdd33a7e98..3d33f2557a 100644 --- a/src/plugins/debugger/consolewindow.cpp +++ b/src/plugins/debugger/consolewindow.cpp @@ -36,14 +36,14 @@ #include "debuggeractions.h" #include "debuggercore.h" -#include <QtCore/QDebug> - -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QPlainTextEdit> +#include <QDebug> + +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QKeyEvent> +#include <QMenu> +#include <QSyntaxHighlighter> +#include <QPlainTextEdit> #include <aggregation/aggregate.h> #include <coreplugin/findplaceholder.h> diff --git a/src/plugins/debugger/consolewindow.h b/src/plugins/debugger/consolewindow.h index 51dffe217b..a4fcab0176 100644 --- a/src/plugins/debugger/consolewindow.h +++ b/src/plugins/debugger/consolewindow.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_CONSOLEWINDOW_H #define DEBUGGER_CONSOLEWINDOW_H -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QCursor; diff --git a/src/plugins/debugger/debugger_global.h b/src/plugins/debugger/debugger_global.h index f8b711d867..237f12d902 100644 --- a/src/plugins/debugger/debugger_global.h +++ b/src/plugins/debugger/debugger_global.h @@ -33,7 +33,7 @@ #ifndef DEBUGGERGLOBAL_H #define DEBUGGERGLOBAL_H -#include <QtCore/QtGlobal> +#include <QtGlobal> #if defined(DEBUGGER_LIBRARY) # define DEBUGGER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index bcb6482980..fe5a76ae82 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -39,9 +39,9 @@ #include <utils/qtcassert.h> #include <utils/pathchooser.h> -#include <QtCore/QDebug> -#include <QtCore/QVariant> -#include <QtCore/QSettings> +#include <QDebug> +#include <QVariant> +#include <QSettings> using namespace Utils; diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h index 081a11e6f2..d35c9ba39e 100644 --- a/src/plugins/debugger/debuggeractions.h +++ b/src/plugins/debugger/debuggeractions.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_ACTIONS_H #define DEBUGGER_ACTIONS_H -#include <QtCore/QHash> -#include <QtCore/QMap> +#include <QHash> +#include <QMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index b605e747c4..db6616f209 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -33,7 +33,7 @@ #ifndef DEBUGGERCONSTANTS_H #define DEBUGGERCONSTANTS_H -#include <QtCore/QFlags> +#include <QFlags> namespace Debugger { namespace Constants { diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h index 13688bbcec..d050f52e05 100644 --- a/src/plugins/debugger/debuggercore.h +++ b/src/plugins/debugger/debuggercore.h @@ -37,8 +37,8 @@ #include <projectexplorer/abi.h> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QIcon; diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 372dc85e91..530a2eee65 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -51,22 +51,22 @@ #include <utils/qtcassert.h> #include <utils/synchronousprocess.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QRegExp> - -#include <QtGui/QButtonGroup> -#include <QtGui/QFileDialog> -#include <QtGui/QGroupBox> -#include <QtGui/QHeaderView> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QRadioButton> -#include <QtGui/QScrollArea> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QStandardItemModel> -#include <QtGui/QGridLayout> +#include <QCoreApplication> +#include <QDebug> +#include <QDir> +#include <QRegExp> + +#include <QButtonGroup> +#include <QFileDialog> +#include <QGroupBox> +#include <QHeaderView> +#include <QMessageBox> +#include <QPushButton> +#include <QRadioButton> +#include <QScrollArea> +#include <QSortFilterProxyModel> +#include <QStandardItemModel> +#include <QGridLayout> using namespace Utils; diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h index 5b22dedb8d..1243c685b4 100644 --- a/src/plugins/debugger/debuggerdialogs.h +++ b/src/plugins/debugger/debuggerdialogs.h @@ -33,10 +33,10 @@ #ifndef DEBUGGER_DIALOGS_H #define DEBUGGER_DIALOGS_H -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtGui/QDialog> -#include <QtGui/QVBoxLayout> +#include <QHash> +#include <QStringList> +#include <QDialog> +#include <QVBoxLayout> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index dc70876025..888b8a1d52 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -66,13 +66,13 @@ #include <utils/savedaction.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QFutureInterface> +#include <QDebug> +#include <QTimer> +#include <QFile> +#include <QFileInfo> +#include <QFutureInterface> -#include <QtGui/QMessageBox> +#include <QMessageBox> using namespace Core; using namespace Debugger::Internal; diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index f9636328b5..312cb30e64 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -37,8 +37,8 @@ #include "debuggerconstants.h" #include "breakpoint.h" // For 'BreakpointId' -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/debugger/debuggerinternalconstants.h b/src/plugins/debugger/debuggerinternalconstants.h index 2b94fdf33c..5132fd328b 100644 --- a/src/plugins/debugger/debuggerinternalconstants.h +++ b/src/plugins/debugger/debuggerinternalconstants.h @@ -33,7 +33,7 @@ #ifndef DEBUGGERINTERNALCONSTANTS_H #define DEBUGGERINTERNALCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Debugger { namespace Constants { diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index a85426238e..c4486a624c 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -58,17 +58,17 @@ #include <projectexplorer/session.h> #include <projectexplorer/target.h> -#include <QtCore/QDebug> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QPair> -#include <QtCore/QSettings> - -#include <QtGui/QDockWidget> -#include <QtGui/QMenu> -#include <QtGui/QResizeEvent> -#include <QtGui/QStackedWidget> -#include <QtGui/QVBoxLayout> +#include <QDebug> +#include <QList> +#include <QMap> +#include <QPair> +#include <QSettings> + +#include <QDockWidget> +#include <QMenu> +#include <QResizeEvent> +#include <QStackedWidget> +#include <QVBoxLayout> using namespace Core; using namespace ProjectExplorer; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 5b7f7e0894..2917f3b698 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -116,24 +116,24 @@ #include <qml/qmljsscriptconsole.h> -#include <QtCore/QTimer> -#include <QtCore/QtPlugin> -#include <QtGui/QComboBox> -#include <QtGui/QDockWidget> -#include <QtGui/QFileDialog> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QToolButton> -#include <QtGui/QTreeWidget> -#include <QtGui/QInputDialog> +#include <QTimer> +#include <QtPlugin> +#include <QComboBox> +#include <QDockWidget> +#include <QFileDialog> +#include <QMenu> +#include <QMessageBox> +#include <QPushButton> +#include <QTextBlock> +#include <QTextCursor> +#include <QToolButton> +#include <QTreeWidget> +#include <QInputDialog> #ifdef WITH_TESTS -#include <QtTest/QTest> -#include <QtTest/QSignalSpy> -#include <QtTest/QTestEventLoop> +#include <QTest> +#include <QSignalSpy> +#include <QTestEventLoop> //#define WITH_BENCHMARK #ifdef WITH_BENCHMARK diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index e87a9268e1..5a1f4f4637 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -67,10 +67,10 @@ #include <coreplugin/icore.h> #include <utils/buildablehelperlibrary.h> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtGui/QMessageBox> -#include <QtGui/QErrorMessage> +#include <QDir> +#include <QDebug> +#include <QMessageBox> +#include <QErrorMessage> using namespace ProjectExplorer; using namespace Debugger::Internal; diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h index e28e2422d9..cbcc87b139 100644 --- a/src/plugins/debugger/debuggerrunner.h +++ b/src/plugins/debugger/debuggerrunner.h @@ -39,8 +39,8 @@ #include <projectexplorer/abi.h> #include <projectexplorer/runconfiguration.h> -#include <QtCore/QPair> -#include <QtCore/QStringList> +#include <QPair> +#include <QStringList> namespace Utils { class Environment; diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 500ae0c99b..1de7aeea54 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -35,20 +35,20 @@ #include <utils/pathchooser.h> #include <utils/qtcassert.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QTreeView> -#include <QtGui/QLineEdit> -#include <QtGui/QSpacerItem> -#include <QtGui/QPushButton> -#include <QtGui/QFormLayout> -#include <QtGui/QFileDialog> -#include <QtGui/QLabel> - -#include <QtCore/QDir> -#include <QtCore/QPair> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QTreeView> +#include <QLineEdit> +#include <QSpacerItem> +#include <QPushButton> +#include <QFormLayout> +#include <QFileDialog> +#include <QLabel> + +#include <QDir> +#include <QPair> // Qt's various build paths for unpatched versions. #if defined(Q_OS_WIN) diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.h b/src/plugins/debugger/debuggersourcepathmappingwidget.h index f842f6ef76..d2d8e52a94 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.h +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.h @@ -33,9 +33,9 @@ #ifndef DEBUGGERSOURCEPATHMAPPINGWIDGET_H #define DEBUGGERSOURCEPATHMAPPINGWIDGET_H -#include <QtGui/QGroupBox> -#include <QtCore/QMap> -#include <QtCore/QPair> +#include <QGroupBox> +#include <QMap> +#include <QPair> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index 859f24db86..6c556d222e 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -41,7 +41,7 @@ #include <projectexplorer/abi.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QMetaType> +#include <QMetaType> namespace Debugger { diff --git a/src/plugins/debugger/debuggerstreamops.cpp b/src/plugins/debugger/debuggerstreamops.cpp index cb813f9de0..cada0ea9d3 100644 --- a/src/plugins/debugger/debuggerstreamops.cpp +++ b/src/plugins/debugger/debuggerstreamops.cpp @@ -36,7 +36,7 @@ #include "watchdata.h" #include "disassemblerlines.h" -#include <QtCore/QDataStream> +#include <QDataStream> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/debuggerstringutils.h b/src/plugins/debugger/debuggerstringutils.h index 8cfbe29ec1..81346636e7 100644 --- a/src/plugins/debugger/debuggerstringutils.h +++ b/src/plugins/debugger/debuggerstringutils.h @@ -35,7 +35,7 @@ #ifndef qdoc -#include <QtCore/QString> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/debuggertoolchaincombobox.cpp b/src/plugins/debugger/debuggertoolchaincombobox.cpp index 3a164a4f13..7270d3e80d 100644 --- a/src/plugins/debugger/debuggertoolchaincombobox.cpp +++ b/src/plugins/debugger/debuggertoolchaincombobox.cpp @@ -37,11 +37,11 @@ #include <projectexplorer/abi.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QPair> +#include <QFileInfo> +#include <QDir> +#include <QPair> -#include <QtGui/QtEvents> +#include <QtEvents> typedef QPair<ProjectExplorer::Abi, QString> AbiDebuggerCommandPair; diff --git a/src/plugins/debugger/debuggertoolchaincombobox.h b/src/plugins/debugger/debuggertoolchaincombobox.h index 5f83b1cdb2..6501dedd2a 100644 --- a/src/plugins/debugger/debuggertoolchaincombobox.h +++ b/src/plugins/debugger/debuggertoolchaincombobox.h @@ -33,7 +33,7 @@ #ifndef DEBUGGERTOOLCHAINCOMBOBOX_H #define DEBUGGERTOOLCHAINCOMBOBOX_H -#include <QtGui/QComboBox> +#include <QComboBox> namespace ProjectExplorer { class Abi; diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index c9a6b7853a..d7ac689cd9 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -52,29 +52,29 @@ #include <utils/qtcassert.h> -#include <QtGui/QToolButton> -#include <QtGui/QToolBar> -#include <QtGui/QVBoxLayout> -#include <QtGui/QStyle> -#include <QtGui/QIcon> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QMoveEvent> -#include <QtGui/QDesktopWidget> -#include <QtGui/QScrollBar> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> -#include <QtGui/QLabel> -#include <QtGui/QClipboard> - -#include <QtCore/QVariant> -#include <QtCore/QStack> -#include <QtCore/QDebug> -#include <QtCore/QTimer> +#include <QToolButton> +#include <QToolBar> +#include <QVBoxLayout> +#include <QStyle> +#include <QIcon> +#include <QApplication> +#include <QMainWindow> +#include <QMoveEvent> +#include <QDesktopWidget> +#include <QScrollBar> +#include <QSortFilterProxyModel> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QPlainTextEdit> +#include <QTextCursor> +#include <QTextDocument> +#include <QLabel> +#include <QClipboard> + +#include <QVariant> +#include <QStack> +#include <QDebug> +#include <QTimer> using namespace Core; using namespace TextEditor; diff --git a/src/plugins/debugger/debuggertooltipmanager.h b/src/plugins/debugger/debuggertooltipmanager.h index b48e4466b7..8c995c622f 100644 --- a/src/plugins/debugger/debuggertooltipmanager.h +++ b/src/plugins/debugger/debuggertooltipmanager.h @@ -35,14 +35,14 @@ #include "debuggerconstants.h" -#include <QtGui/QTreeView> - -#include <QtCore/QPointer> -#include <QtCore/QPoint> -#include <QtCore/QList> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QDate> +#include <QTreeView> + +#include <QPointer> +#include <QPoint> +#include <QList> +#include <QXmlStreamWriter> +#include <QXmlStreamReader> +#include <QDate> QT_BEGIN_NAMESPACE class QVBoxLayout; diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index 940b2b1ad8..e8dabf52b5 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -53,11 +53,11 @@ #include <utils/qtcassert.h> -#include <QtGui/QTextBlock> -#include <QtGui/QIcon> -#include <QtCore/QPointer> -#include <QtCore/QPair> -#include <QtCore/QDir> +#include <QTextBlock> +#include <QIcon> +#include <QPointer> +#include <QPair> +#include <QDir> using namespace Core; using namespace TextEditor; diff --git a/src/plugins/debugger/disassembleragent.h b/src/plugins/debugger/disassembleragent.h index e65896dcc4..88365f5b84 100644 --- a/src/plugins/debugger/disassembleragent.h +++ b/src/plugins/debugger/disassembleragent.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_DISASSEMBLERAGENT_H #define DEBUGGER_DISASSEMBLERAGENT_H -#include <QtCore/QObject> +#include <QObject> namespace Debugger { diff --git a/src/plugins/debugger/disassemblerlines.cpp b/src/plugins/debugger/disassemblerlines.cpp index 45b9423b7c..a79632efb8 100644 --- a/src/plugins/debugger/disassemblerlines.cpp +++ b/src/plugins/debugger/disassemblerlines.cpp @@ -33,10 +33,10 @@ #include "disassemblerlines.h" #include "debuggerstringutils.h" -#include <QtCore/QDebug> -#include <QtCore/QRegExp> -#include <QtCore/QFile> -#include <QtCore/QTextStream> +#include <QDebug> +#include <QRegExp> +#include <QFile> +#include <QTextStream> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/disassemblerlines.h b/src/plugins/debugger/disassemblerlines.h index 4bd8ffef70..b67184c132 100644 --- a/src/plugins/debugger/disassemblerlines.h +++ b/src/plugins/debugger/disassemblerlines.h @@ -33,9 +33,9 @@ #ifndef DEBUGGER_DISASSEMBLERLINES_H #define DEBUGGER_DISASSEMBLERLINES_H -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QVector> +#include <QStringList> +#include <QHash> +#include <QVector> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.cpp b/src/plugins/debugger/gdb/abstractgdbadapter.cpp index 2003adebb5..c258ac7936 100644 --- a/src/plugins/debugger/gdb/abstractgdbadapter.cpp +++ b/src/plugins/debugger/gdb/abstractgdbadapter.cpp @@ -39,7 +39,7 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> -#include <QtCore/QProcess> +#include <QProcess> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.h b/src/plugins/debugger/gdb/abstractgdbadapter.h index 41365e2c9e..05410a9d61 100644 --- a/src/plugins/debugger/gdb/abstractgdbadapter.h +++ b/src/plugins/debugger/gdb/abstractgdbadapter.h @@ -38,7 +38,7 @@ // on invoking the first adapter callback in a *derived* adapter class. #include "gdbengine.h" -#include <QtCore/QObject> +#include <QObject> namespace Debugger { class DebuggerStartParameters; diff --git a/src/plugins/debugger/gdb/abstractgdbprocess.h b/src/plugins/debugger/gdb/abstractgdbprocess.h index 98c734c96f..310cd2bfaf 100644 --- a/src/plugins/debugger/gdb/abstractgdbprocess.h +++ b/src/plugins/debugger/gdb/abstractgdbprocess.h @@ -33,8 +33,8 @@ #ifndef GDBPROCESSWRAPPER_H #define GDBPROCESSWRAPPER_H -#include <QtCore/QObject> -#include <QtCore/QProcess> +#include <QObject> +#include <QProcess> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp index dca87aebc1..a9dd32c0a4 100644 --- a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp @@ -38,9 +38,9 @@ #include "debuggercore.h" #include "debuggerstringutils.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QTemporaryFile> +#include <QDir> +#include <QFile> +#include <QTemporaryFile> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp index 418a0dca6b..fd21906a51 100644 --- a/src/plugins/debugger/gdb/classicgdbengine.cpp +++ b/src/plugins/debugger/gdb/classicgdbengine.cpp @@ -46,9 +46,9 @@ #include <utils/savedaction.h> #include <utils/fileutils.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> +#include <QFile> +#include <QFileInfo> +#include <QMessageBox> #if !defined(Q_OS_WIN) #include <dlfcn.h> diff --git a/src/plugins/debugger/gdb/codagdbadapter.cpp b/src/plugins/debugger/gdb/codagdbadapter.cpp index 609777bd18..63f71674ff 100644 --- a/src/plugins/debugger/gdb/codagdbadapter.cpp +++ b/src/plugins/debugger/gdb/codagdbadapter.cpp @@ -54,10 +54,10 @@ #include <utils/savedaction.h> #include <utils/qtcprocess.h> -#include <QtCore/QTimer> -#include <QtCore/QDir> -#include <QtNetwork/QTcpServer> -#include <QtNetwork/QTcpSocket> +#include <QTimer> +#include <QDir> +#include <QTcpServer> +#include <QTcpSocket> #ifndef Q_OS_WIN # include <sys/types.h> diff --git a/src/plugins/debugger/gdb/codagdbadapter.h b/src/plugins/debugger/gdb/codagdbadapter.h index a6ecf7a331..d517cdedaf 100644 --- a/src/plugins/debugger/gdb/codagdbadapter.h +++ b/src/plugins/debugger/gdb/codagdbadapter.h @@ -39,10 +39,10 @@ #include "codautils.h" #include "symbian.h" -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QStringList> -#include <QtCore/QHash> +#include <QPointer> +#include <QSharedPointer> +#include <QStringList> +#include <QHash> QT_BEGIN_NAMESPACE class QTcpServer; diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp index 2bc0ca3f65..8a5b7a1e51 100644 --- a/src/plugins/debugger/gdb/coregdbadapter.cpp +++ b/src/plugins/debugger/gdb/coregdbadapter.cpp @@ -41,9 +41,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> +#include <QDir> +#include <QFileInfo> +#include <QMessageBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 92ba0f5795..07034fed92 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -77,22 +77,22 @@ #include <texteditor/itexteditor.h> #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QMetaObject> -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QTemporaryFile> -#include <QtCore/QTextStream> - -#include <QtGui/QAction> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLabel> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QCoreApplication> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QMetaObject> +#include <QTime> +#include <QTimer> +#include <QTemporaryFile> +#include <QTextStream> + +#include <QAction> +#include <QDialogButtonBox> +#include <QLabel> +#include <QMainWindow> +#include <QMessageBox> +#include <QPushButton> #ifdef Q_OS_UNIX #include <unistd.h> diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index f4de4e1f70..f8b8fc3df5 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -38,18 +38,18 @@ #include "stackframe.h" #include "watchutils.h" -#include <QtCore/QByteArray> -#include <QtCore/QProcess> -#include <QtCore/QHash> -#include <QtCore/QMap> -#include <QtCore/QMultiMap> -#include <QtCore/QObject> -#include <QtCore/QPoint> -#include <QtCore/QSet> -#include <QtCore/QTextCodec> -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QVariant> +#include <QByteArray> +#include <QProcess> +#include <QHash> +#include <QMap> +#include <QMultiMap> +#include <QObject> +#include <QPoint> +#include <QSet> +#include <QTextCodec> +#include <QTime> +#include <QTimer> +#include <QVariant> namespace Debugger { diff --git a/src/plugins/debugger/gdb/gdbmi.cpp b/src/plugins/debugger/gdb/gdbmi.cpp index 117e81122d..df721160e2 100644 --- a/src/plugins/debugger/gdb/gdbmi.cpp +++ b/src/plugins/debugger/gdb/gdbmi.cpp @@ -34,9 +34,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QByteArray> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> +#include <QByteArray> +#include <QRegExp> +#include <QTextStream> #include <ctype.h> diff --git a/src/plugins/debugger/gdb/gdbmi.h b/src/plugins/debugger/gdb/gdbmi.h index 9727f42764..5559db1d27 100644 --- a/src/plugins/debugger/gdb/gdbmi.h +++ b/src/plugins/debugger/gdb/gdbmi.h @@ -33,9 +33,9 @@ #ifndef DEBUGGER_GDBMI_H #define DEBUGGER_GDBMI_H -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QVariant> +#include <QByteArray> +#include <QList> +#include <QVariant> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp index 8705bd96e1..47da2f08fb 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.cpp +++ b/src/plugins/debugger/gdb/gdboptionspage.cpp @@ -38,19 +38,19 @@ #include <coreplugin/icore.h> #include <projectexplorer/projectexplorer.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> - -#include <QtGui/QCheckBox> -#include <QtGui/QFormLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QRadioButton> -#include <QtGui/QSpinBox> -#include <QtGui/QTextEdit> +#include <QCoreApplication> +#include <QDebug> +#include <QTextStream> + +#include <QCheckBox> +#include <QFormLayout> +#include <QGridLayout> +#include <QGroupBox> +#include <QLabel> +#include <QLineEdit> +#include <QRadioButton> +#include <QSpinBox> +#include <QTextEdit> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.cpp b/src/plugins/debugger/gdb/localplaingdbadapter.cpp index 3958a8945d..0b0060ffa6 100644 --- a/src/plugins/debugger/gdb/localplaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/localplaingdbadapter.cpp @@ -42,9 +42,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtGui/QMessageBox> +#include <QFileInfo> +#include <QProcess> +#include <QMessageBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/remotegdbprocess.cpp b/src/plugins/debugger/gdb/remotegdbprocess.cpp index 7de5675d3a..cc510c2f88 100644 --- a/src/plugins/debugger/gdb/remotegdbprocess.cpp +++ b/src/plugins/debugger/gdb/remotegdbprocess.cpp @@ -38,7 +38,7 @@ #include <utils/qtcprocess.h> #include <utils/ssh/sshconnectionmanager.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> #include <ctype.h> diff --git a/src/plugins/debugger/gdb/remotegdbprocess.h b/src/plugins/debugger/gdb/remotegdbprocess.h index a31e690b5d..b9888a5441 100644 --- a/src/plugins/debugger/gdb/remotegdbprocess.h +++ b/src/plugins/debugger/gdb/remotegdbprocess.h @@ -38,8 +38,8 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocess.h> -#include <QtCore/QByteArray> -#include <QtCore/QQueue> +#include <QByteArray> +#include <QQueue> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index 26ee53b9a2..9cd71bd3a9 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -43,8 +43,8 @@ #include <utils/fancymainwindow.h> #include <projectexplorer/abi.h> -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> +#include <QFileInfo> +#include <QMessageBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/symbian.cpp b/src/plugins/debugger/gdb/symbian.cpp index be333f05b9..d690077ba0 100644 --- a/src/plugins/debugger/gdb/symbian.cpp +++ b/src/plugins/debugger/gdb/symbian.cpp @@ -37,9 +37,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QTextStream> +#include <QFileInfo> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/symbian.h b/src/plugins/debugger/gdb/symbian.h index 4d22a10a44..0964368e05 100644 --- a/src/plugins/debugger/gdb/symbian.h +++ b/src/plugins/debugger/gdb/symbian.h @@ -33,11 +33,11 @@ #ifndef SYMBIANUTILS_H #define SYMBIANUTILS_H -#include <QtCore/QMap> -#include <QtCore/QByteArray> -#include <QtCore/QMetaType> -#include <QtCore/QVector> -#include <QtCore/QPair> +#include <QMap> +#include <QByteArray> +#include <QMetaType> +#include <QVector> +#include <QPair> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp index 080b0c1cac..8acff6ede4 100644 --- a/src/plugins/debugger/gdb/termgdbadapter.cpp +++ b/src/plugins/debugger/gdb/termgdbadapter.cpp @@ -43,7 +43,7 @@ #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtGui/QMessageBox> +#include <QMessageBox> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/guest/lldbengineguest.cpp b/src/plugins/debugger/lldb/guest/lldbengineguest.cpp index 3f43823557..2651c98eb0 100644 --- a/src/plugins/debugger/lldb/guest/lldbengineguest.cpp +++ b/src/plugins/debugger/lldb/guest/lldbengineguest.cpp @@ -50,11 +50,11 @@ #include "threadshandler.h" #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QProcess> -#include <QtCore/QFileInfo> -#include <QtCore/QThread> -#include <QtCore/QMutexLocker> +#include <QDebug> +#include <QProcess> +#include <QFileInfo> +#include <QThread> +#include <QMutexLocker> #include <lldb/API/LLDB.h> diff --git a/src/plugins/debugger/lldb/guest/lldbengineguest.h b/src/plugins/debugger/lldb/guest/lldbengineguest.h index 54aea5ab49..2b88f1344f 100644 --- a/src/plugins/debugger/lldb/guest/lldbengineguest.h +++ b/src/plugins/debugger/lldb/guest/lldbengineguest.h @@ -35,10 +35,10 @@ #include "ipcengineguest.h" -#include <QtCore/QQueue> -#include <QtCore/QVariant> -#include <QtCore/QThread> -#include <QtCore/QStringList> +#include <QQueue> +#include <QVariant> +#include <QThread> +#include <QStringList> #include <lldb/API/LLDB.h> diff --git a/src/plugins/debugger/lldb/guest/main.cpp b/src/plugins/debugger/lldb/guest/main.cpp index 8f26d2cd0c..a11d0ce9f5 100644 --- a/src/plugins/debugger/lldb/guest/main.cpp +++ b/src/plugins/debugger/lldb/guest/main.cpp @@ -32,10 +32,10 @@ #include "lldbengineguest.h" -#include <QtNetwork/QLocalSocket> -#include <QtCore/QCoreApplication> -#include <QtCore/QSocketNotifier> -#include <QtCore/QQueue> +#include <QLocalSocket> +#include <QCoreApplication> +#include <QSocketNotifier> +#include <QQueue> #include <cstdio> diff --git a/src/plugins/debugger/lldb/ipcengineguest.cpp b/src/plugins/debugger/lldb/ipcengineguest.cpp index d206e3376b..144382f175 100644 --- a/src/plugins/debugger/lldb/ipcengineguest.cpp +++ b/src/plugins/debugger/lldb/ipcengineguest.cpp @@ -39,12 +39,12 @@ #include <utils/qtcassert.h> -#include <QtNetwork/QLocalSocket> +#include <QLocalSocket> -#include <QtCore/QSysInfo> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> +#include <QSysInfo> +#include <QDebug> +#include <QFileInfo> +#include <QTimer> #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN #define SET_NATIVE_BYTE_ORDER(x) x.setByteOrder(QDataStream::LittleEndian) diff --git a/src/plugins/debugger/lldb/ipcengineguest.h b/src/plugins/debugger/lldb/ipcengineguest.h index d5cf4d29b6..4a5eb88a5b 100644 --- a/src/plugins/debugger/lldb/ipcengineguest.h +++ b/src/plugins/debugger/lldb/ipcengineguest.h @@ -39,9 +39,9 @@ #include "stackhandler.h" #include "threadshandler.h" -#include <QtCore/QQueue> -#include <QtCore/QThread> -#include <QtCore/QVariant> +#include <QQueue> +#include <QThread> +#include <QVariant> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/ipcenginehost.cpp b/src/plugins/debugger/lldb/ipcenginehost.cpp index 398e1ea931..1c6765f4fc 100644 --- a/src/plugins/debugger/lldb/ipcenginehost.cpp +++ b/src/plugins/debugger/lldb/ipcenginehost.cpp @@ -50,11 +50,11 @@ #include <utils/qtcassert.h> -#include <QtCore/QSysInfo> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> -#include <QtNetwork/QLocalSocket> +#include <QSysInfo> +#include <QDebug> +#include <QFileInfo> +#include <QTimer> +#include <QLocalSocket> #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN #define SET_NATIVE_BYTE_ORDER(x) x.setByteOrder(QDataStream::LittleEndian) diff --git a/src/plugins/debugger/lldb/ipcenginehost.h b/src/plugins/debugger/lldb/ipcenginehost.h index 61385a58c4..b75e1ceeaa 100644 --- a/src/plugins/debugger/lldb/ipcenginehost.h +++ b/src/plugins/debugger/lldb/ipcenginehost.h @@ -39,9 +39,9 @@ #include "breakhandler.h" #include "sourceagent.h" -#include <QtCore/QQueue> -#include <QtCore/QVariant> -#include <QtCore/QThread> +#include <QQueue> +#include <QVariant> +#include <QThread> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/lldbenginehost.cpp b/src/plugins/debugger/lldb/lldbenginehost.cpp index 7a0a9eec28..a80854111f 100644 --- a/src/plugins/debugger/lldb/lldbenginehost.cpp +++ b/src/plugins/debugger/lldb/lldbenginehost.cpp @@ -55,11 +55,11 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QProcess> -#include <QtCore/QFileInfo> -#include <QtCore/QThread> -#include <QtCore/QCoreApplication> +#include <QDebug> +#include <QProcess> +#include <QFileInfo> +#include <QThread> +#include <QCoreApplication> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/lldbenginehost.h b/src/plugins/debugger/lldb/lldbenginehost.h index 2c155c9d96..2978033849 100644 --- a/src/plugins/debugger/lldb/lldbenginehost.h +++ b/src/plugins/debugger/lldb/lldbenginehost.h @@ -39,8 +39,8 @@ #include <utils/ssh/sshremoteprocess.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QProcess> -#include <QtCore/QQueue> +#include <QProcess> +#include <QQueue> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/lldboptionspage.cpp b/src/plugins/debugger/lldb/lldboptionspage.cpp index 71f218fc46..35b9670ed6 100644 --- a/src/plugins/debugger/lldb/lldboptionspage.cpp +++ b/src/plugins/debugger/lldb/lldboptionspage.cpp @@ -36,11 +36,11 @@ #include <coreplugin/icore.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QUrl> -#include <QtCore/QTextStream> -#include <QtGui/QMessageBox> -#include <QtGui/QDesktopServices> +#include <QCoreApplication> +#include <QUrl> +#include <QTextStream> +#include <QMessageBox> +#include <QDesktopServices> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/lldb/lldboptionspage.h b/src/plugins/debugger/lldb/lldboptionspage.h index 41149885ed..4ef3b8db3c 100644 --- a/src/plugins/debugger/lldb/lldboptionspage.h +++ b/src/plugins/debugger/lldb/lldboptionspage.h @@ -36,10 +36,10 @@ #include <coreplugin/dialogs/ioptionspage.h> #include "ui_lldboptionspagewidget.h" -#include <QtGui/QWidget> -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QSettings> +#include <QWidget> +#include <QPointer> +#include <QSharedPointer> +#include <QSettings> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp index 2bf108892d..8c5a9fbd01 100644 --- a/src/plugins/debugger/logwindow.cpp +++ b/src/plugins/debugger/logwindow.cpp @@ -35,21 +35,21 @@ #include "debuggeractions.h" #include "debuggercore.h" -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QTime> - -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QSpacerItem> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QFile> +#include <QTime> + +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QLabel> +#include <QLineEdit> +#include <QKeyEvent> +#include <QMenu> +#include <QSpacerItem> +#include <QSyntaxHighlighter> +#include <QPlainTextEdit> +#include <QFileDialog> +#include <QMessageBox> #include <aggregation/aggregate.h> #include <coreplugin/findplaceholder.h> diff --git a/src/plugins/debugger/logwindow.h b/src/plugins/debugger/logwindow.h index 0d95dd6250..4bceac728f 100644 --- a/src/plugins/debugger/logwindow.h +++ b/src/plugins/debugger/logwindow.h @@ -35,7 +35,7 @@ #include "debuggerconstants.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QCursor; diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp index 2e64afd83c..96078d6c90 100644 --- a/src/plugins/debugger/memoryagent.cpp +++ b/src/plugins/debugger/memoryagent.cpp @@ -47,9 +47,9 @@ #include <extensionsystem/pluginmanager.h> #include <extensionsystem/invoker.h> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QVBoxLayout> +#include <QMessageBox> +#include <QMainWindow> +#include <QVBoxLayout> #include <cstring> diff --git a/src/plugins/debugger/memoryagent.h b/src/plugins/debugger/memoryagent.h index 48aefd2106..236061a7ab 100644 --- a/src/plugins/debugger/memoryagent.h +++ b/src/plugins/debugger/memoryagent.h @@ -35,11 +35,11 @@ #include "debuggerconstants.h" -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtGui/QColor> +#include <QObject> +#include <QPointer> +#include <QString> +#include <QList> +#include <QColor> QT_FORWARD_DECLARE_CLASS(QPoint) diff --git a/src/plugins/debugger/memoryview.cpp b/src/plugins/debugger/memoryview.cpp index e0d0afa46f..2857bac1b4 100644 --- a/src/plugins/debugger/memoryview.cpp +++ b/src/plugins/debugger/memoryview.cpp @@ -36,9 +36,9 @@ #include <bineditor/markup.h> -#include <QtGui/QVBoxLayout> -#include <QtCore/QModelIndex> -#include <QtCore/QDebug> +#include <QVBoxLayout> +#include <QModelIndex> +#include <QDebug> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/memoryview.h b/src/plugins/debugger/memoryview.h index 9f02c49682..623155760f 100644 --- a/src/plugins/debugger/memoryview.h +++ b/src/plugins/debugger/memoryview.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_INTERNAL_MEMORYVIEW_H #define DEBUGGER_INTERNAL_MEMORYVIEW_H -#include <QtGui/QWidget> +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QModelIndex) diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp index 4b6892617b..d7fa3413a9 100644 --- a/src/plugins/debugger/moduleshandler.cpp +++ b/src/plugins/debugger/moduleshandler.cpp @@ -34,8 +34,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtGui/QSortFilterProxyModel> +#include <QDebug> +#include <QSortFilterProxyModel> ////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/moduleshandler.h b/src/plugins/debugger/moduleshandler.h index 83386d9685..41f5c77cab 100644 --- a/src/plugins/debugger/moduleshandler.h +++ b/src/plugins/debugger/moduleshandler.h @@ -33,9 +33,9 @@ #ifndef DEBUGGER_MODULESHANDLER_H #define DEBUGGER_MODULESHANDLER_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QObject> -#include <QtCore/QVector> +#include <QAbstractItemModel> +#include <QObject> +#include <QVector> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp index d60d0789b9..6057188519 100644 --- a/src/plugins/debugger/moduleswindow.cpp +++ b/src/plugins/debugger/moduleswindow.cpp @@ -40,12 +40,12 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtCore/QProcess> +#include <QDebug> +#include <QProcess> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> -#include <QtGui/QResizeEvent> +#include <QHeaderView> +#include <QMenu> +#include <QResizeEvent> /////////////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/name_demangler.cpp b/src/plugins/debugger/name_demangler.cpp index 8b7023baab..73cdf628d6 100644 --- a/src/plugins/debugger/name_demangler.cpp +++ b/src/plugins/debugger/name_demangler.cpp @@ -32,12 +32,12 @@ #include "name_demangler.h" -#include <QtCore/QChar> -#include <QtCore/QMap> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QChar> +#include <QMap> +#include <QRegExp> +#include <QSet> +#include <QString> +#include <QStringList> // Debugging facility. //#define DO_TRACE diff --git a/src/plugins/debugger/name_demangler.h b/src/plugins/debugger/name_demangler.h index ed9a700864..9787c01408 100644 --- a/src/plugins/debugger/name_demangler.h +++ b/src/plugins/debugger/name_demangler.h @@ -33,7 +33,7 @@ #ifndef NAME_DEMANGLER_H #define NAME_DEMANGLER_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/debugger/outputcollector.cpp b/src/plugins/debugger/outputcollector.cpp index e194c65397..c621df176e 100644 --- a/src/plugins/debugger/outputcollector.cpp +++ b/src/plugins/debugger/outputcollector.cpp @@ -34,18 +34,18 @@ #ifdef Q_OS_WIN -#include <QtNetwork/QLocalServer> -#include <QtNetwork/QLocalSocket> -#include <QtCore/QCoreApplication> +#include <QLocalServer> +#include <QLocalSocket> +#include <QCoreApplication> #include <stdlib.h> #else -#include <QtCore/QFile> -#include <QtCore/QSocketNotifier> -#include <QtCore/QTemporaryFile> -#include <QtCore/QVarLengthArray> +#include <QFile> +#include <QSocketNotifier> +#include <QTemporaryFile> +#include <QVarLengthArray> #include <sys/ioctl.h> #include <sys/types.h> diff --git a/src/plugins/debugger/outputcollector.h b/src/plugins/debugger/outputcollector.h index ee695444ac..fee16bba5b 100644 --- a/src/plugins/debugger/outputcollector.h +++ b/src/plugins/debugger/outputcollector.h @@ -33,7 +33,7 @@ #ifndef OUTPUT_COLLECTOR_H #define OUTPUT_COLLECTOR_H -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QLocalServer; diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 2e43589bfe..72631e4b5b 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -57,16 +57,16 @@ #include <coreplugin/ifile.h> #include <coreplugin/icore.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> -#include <QtCore/QVariant> - -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtGui/QToolTip> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTimer> +#include <QVariant> + +#include <QApplication> +#include <QMessageBox> +#include <QToolTip> #define DEBUG_SCRIPT 1 diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index 13283e97fb..d1370b025a 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -35,9 +35,9 @@ #include "debuggerengine.h" -#include <QtCore/QProcess> -#include <QtCore/QQueue> -#include <QtCore/QVariant> +#include <QProcess> +#include <QQueue> +#include <QVariant> namespace Debugger { diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp index cb20e6e0b3..09b725b2b9 100644 --- a/src/plugins/debugger/procinterrupt.cpp +++ b/src/plugins/debugger/procinterrupt.cpp @@ -33,10 +33,10 @@ #include "procinterrupt.h" #include "debuggerconstants.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QProcess> // makes kill visible on Windows. -#include <QtCore/QFile> -#include <QtCore/QDir> +#include <QCoreApplication> +#include <QProcess> // makes kill visible on Windows. +#include <QFile> +#include <QDir> using namespace Debugger::Internal; diff --git a/src/plugins/debugger/procinterrupt.h b/src/plugins/debugger/procinterrupt.h index ec6f6f8a78..e25a883305 100644 --- a/src/plugins/debugger/procinterrupt.h +++ b/src/plugins/debugger/procinterrupt.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_PROCINTERRUPT_H #define DEBUGGER_PROCINTERRUPT_H -#include <QtCore/QString> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/interactiveinterpreter.h b/src/plugins/debugger/qml/interactiveinterpreter.h index 3e10a46610..b8e45ae736 100644 --- a/src/plugins/debugger/qml/interactiveinterpreter.h +++ b/src/plugins/debugger/qml/interactiveinterpreter.h @@ -36,9 +36,9 @@ #include <qmljs/parser/qmljslexer_p.h> #include <qmljs/parser/qmljsengine_p.h> -#include <QtCore/QVector> -#include <QtCore/QString> -#include <QtCore/QList> +#include <QVector> +#include <QString> +#include <QList> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp index f78a863331..d36b17f4fc 100644 --- a/src/plugins/debugger/qml/qmladapter.cpp +++ b/src/plugins/debugger/qml/qmladapter.cpp @@ -44,8 +44,8 @@ #include <qmljsdebugclient/qdebugmessageclient.h> -#include <QtCore/QTimer> -#include <QtCore/QDebug> +#include <QTimer> +#include <QDebug> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h index 59d5258d0c..9ec6dc9015 100644 --- a/src/plugins/debugger/qml/qmladapter.h +++ b/src/plugins/debugger/qml/qmladapter.h @@ -36,8 +36,8 @@ #include "debugger_global.h" #include "qmldebuggerclient.h" -#include <QtCore/QObject> -#include <QtNetwork/QAbstractSocket> +#include <QObject> +#include <QAbstractSocket> namespace QmlJsDebugClient { class QDeclarativeEngineDebug; diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index e657db4926..a326ee3b5f 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -40,8 +40,8 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QTimer> -#include <QtGui/QMainWindow> +#include <QTimer> +#include <QMainWindow> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 85c6bfc583..7a7b72c128 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -68,22 +68,22 @@ #include <texteditor/itexteditor.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QToolTip> -#include <QtGui/QTextDocument> - -#include <QtNetwork/QTcpSocket> -#include <QtNetwork/QHostAddress> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTimer> + +#include <QAction> +#include <QApplication> +#include <QMainWindow> +#include <QMessageBox> +#include <QPlainTextEdit> +#include <QToolTip> +#include <QTextDocument> + +#include <QTcpSocket> +#include <QHostAddress> #define DEBUG_QML 1 #if DEBUG_QML diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 07ef33559b..69e0de76ba 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -37,7 +37,7 @@ #include <utils/outputformat.h> -#include <QtNetwork/QAbstractSocket> +#include <QAbstractSocket> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/debugger/qml/qmljsscriptconsole.cpp b/src/plugins/debugger/qml/qmljsscriptconsole.cpp index 2325e80e6f..1579875bd2 100644 --- a/src/plugins/debugger/qml/qmljsscriptconsole.cpp +++ b/src/plugins/debugger/qml/qmljsscriptconsole.cpp @@ -52,12 +52,12 @@ #include <debugger/stackhandler.h> #include <debugger/stackframe.h> -#include <QtGui/QMenu> -#include <QtGui/QTextBlock> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QToolButton> -#include <QtGui/QCheckBox> +#include <QMenu> +#include <QTextBlock> +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QToolButton> +#include <QCheckBox> static const char SCRIPT_CONSOLE[] = "ScriptConsole"; static const char SHOW_LOG[] = "showLog"; diff --git a/src/plugins/debugger/qml/qmljsscriptconsole.h b/src/plugins/debugger/qml/qmljsscriptconsole.h index c42852d338..aef7b72401 100644 --- a/src/plugins/debugger/qml/qmljsscriptconsole.h +++ b/src/plugins/debugger/qml/qmljsscriptconsole.h @@ -35,7 +35,7 @@ #include <qmljsdebugclient/qdeclarativeenginedebug.h> #include <debugger/debuggerconstants.h> -#include <QtGui/QPlainTextEdit> +#include <QPlainTextEdit> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 9201a5d461..471eb42b76 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -44,14 +44,14 @@ #include <coreplugin/editormanager/editormanager.h> #include <texteditor/basetexteditor.h> -#include <QtGui/QTextBlock> -#include <QtCore/QVariant> -#include <QtCore/QStack> -#include <QtCore/QQueue> -#include <QtCore/QFileInfo> -#include <QtGui/QTextDocument> -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptValue> +#include <QTextBlock> +#include <QVariant> +#include <QStack> +#include <QQueue> +#include <QFileInfo> +#include <QTextDocument> +#include <QScriptEngine> +#include <QScriptValue> #define DEBUG_QML 0 #if DEBUG_QML diff --git a/src/plugins/debugger/registerhandler.h b/src/plugins/debugger/registerhandler.h index fad0f2e06a..f9f9f0eaad 100644 --- a/src/plugins/debugger/registerhandler.h +++ b/src/plugins/debugger/registerhandler.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_REGISTERHANDLER_H #define DEBUGGER_REGISTERHANDLER_H -#include <QtCore/QAbstractTableModel> -#include <QtCore/QVector> +#include <QAbstractTableModel> +#include <QVector> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp index 2325b7fc00..3ceedaaccc 100644 --- a/src/plugins/debugger/registerpostmortemaction.cpp +++ b/src/plugins/debugger/registerpostmortemaction.cpp @@ -38,9 +38,9 @@ #include "registryaccess.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QString> +#include <QCoreApplication> +#include <QDir> +#include <QString> #include <Windows.h> #include <Objbase.h> diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp index e07f61bf1a..b1c74c8b72 100644 --- a/src/plugins/debugger/registerwindow.cpp +++ b/src/plugins/debugger/registerwindow.cpp @@ -44,13 +44,13 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QHeaderView> -#include <QtGui/QItemDelegate> -#include <QtGui/QMenu> -#include <QtGui/QPainter> -#include <QtGui/QResizeEvent> +#include <QHeaderView> +#include <QItemDelegate> +#include <QMenu> +#include <QPainter> +#include <QResizeEvent> namespace Debugger { diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index d6ec3fd08f..b95b4ec697 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -54,23 +54,23 @@ #include <coreplugin/scriptmanager/scriptmanager.h> #include <coreplugin/icore.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> - -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtGui/QToolTip> - -#include <QtScript/QScriptContext> -#include <QtScript/QScriptClassPropertyIterator> -#include <QtScript/QScriptContextInfo> -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptEngineAgent> -#include <QtScript/QScriptValue> -#include <QtScript/QScriptValueIterator> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTimer> + +#include <QApplication> +#include <QMessageBox> +#include <QToolTip> + +#include <QScriptContext> +#include <QScriptClassPropertyIterator> +#include <QScriptContextInfo> +#include <QScriptEngine> +#include <QScriptEngineAgent> +#include <QScriptValue> +#include <QScriptValueIterator> namespace Debugger { diff --git a/src/plugins/debugger/script/scriptengine.h b/src/plugins/debugger/script/scriptengine.h index fa56c04067..df9bd7be99 100644 --- a/src/plugins/debugger/script/scriptengine.h +++ b/src/plugins/debugger/script/scriptengine.h @@ -35,9 +35,9 @@ #include "debuggerengine.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QScopedPointer> -#include <QtCore/QHash> +#include <QSharedPointer> +#include <QScopedPointer> +#include <QHash> QT_BEGIN_NAMESPACE class QScriptEngine; diff --git a/src/plugins/debugger/shared/backtrace.cpp b/src/plugins/debugger/shared/backtrace.cpp index 596fe313f3..2df2e68822 100644 --- a/src/plugins/debugger/shared/backtrace.cpp +++ b/src/plugins/debugger/shared/backtrace.cpp @@ -30,9 +30,9 @@ ** **************************************************************************/ -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QProcess> +#include <QCoreApplication> +#include <QDebug> +#include <QProcess> #if defined(Q_OS_LINUX) #include <stdio.h> diff --git a/src/plugins/debugger/shared/backtrace.h b/src/plugins/debugger/shared/backtrace.h index b391d96970..68bd7a2f94 100644 --- a/src/plugins/debugger/shared/backtrace.h +++ b/src/plugins/debugger/shared/backtrace.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_BACKTRACE_H #define DEBUGGER_BACKTRACE_H -#include <QtCore/qglobal.h> +#include <qglobal.h> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp index 98e1bd22f0..1368560f26 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp @@ -37,15 +37,15 @@ #include <utils/pathchooser.h> #include <utils/checkablemessagebox.h> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtGui/QFileDialog> -#include <QtGui/QAction> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QVBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QDir> +#include <QDebug> +#include <QFileDialog> +#include <QAction> +#include <QDialogButtonBox> +#include <QVBoxLayout> +#include <QFormLayout> +#include <QMessageBox> +#include <QMainWindow> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h index e4732e738e..0ae014ceb4 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h @@ -35,7 +35,7 @@ #include <utils/pathlisteditor.h> -#include <QtGui/QDialog> +#include <QDialog> namespace Utils { class PathChooser; diff --git a/src/plugins/debugger/shared/hostutils.cpp b/src/plugins/debugger/shared/hostutils.cpp index 84bc348f29..54ed87a23c 100644 --- a/src/plugins/debugger/shared/hostutils.cpp +++ b/src/plugins/debugger/shared/hostutils.cpp @@ -35,13 +35,13 @@ #include <utils/synchronousprocess.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QLibrary> -#include <QtCore/QProcess> -#include <QtCore/QString> -#include <QtCore/QTextStream> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QLibrary> +#include <QProcess> +#include <QString> +#include <QTextStream> #ifdef Q_OS_WIN diff --git a/src/plugins/debugger/shared/hostutils.h b/src/plugins/debugger/shared/hostutils.h index 3d00545f0e..98d85414e9 100644 --- a/src/plugins/debugger/shared/hostutils.h +++ b/src/plugins/debugger/shared/hostutils.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_HOSTUTILS_H #define DEBUGGER_HOSTUTILS_H -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp index 2c58a5c0a6..04bf69c4c0 100644 --- a/src/plugins/debugger/shared/peutils.cpp +++ b/src/plugins/debugger/shared/peutils.cpp @@ -33,8 +33,8 @@ #include "peutils.h" #include <utils/winutils.h> -#include <QtCore/QStringList> -#include <QtCore/QDebug> +#include <QStringList> +#include <QDebug> #include <climits> #include <windows.h> diff --git a/src/plugins/debugger/shared/peutils.h b/src/plugins/debugger/shared/peutils.h index 31523d0282..76de0bc65f 100644 --- a/src/plugins/debugger/shared/peutils.h +++ b/src/plugins/debugger/shared/peutils.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_PEUTILS_H #define DEBUGGER_PEUTILS_H -#include <QtCore/qnamespace.h> +#include <qnamespace.h> QT_BEGIN_NAMESPACE class QStringList; diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp index 92e3913e62..1f03891fef 100644 --- a/src/plugins/debugger/snapshothandler.cpp +++ b/src/plugins/debugger/snapshothandler.cpp @@ -41,9 +41,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtGui/QIcon> +#include <QDebug> +#include <QFile> +#include <QIcon> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/snapshothandler.h b/src/plugins/debugger/snapshothandler.h index aeb826c8ec..2e35ea4352 100644 --- a/src/plugins/debugger/snapshothandler.h +++ b/src/plugins/debugger/snapshothandler.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_SNAPSHOTHANDLER_H #define DEBUGGER_SNAPSHOTHANDLER_H -#include <QtCore/QAbstractTableModel> -#include <QtCore/QPointer> +#include <QAbstractTableModel> +#include <QPointer> namespace Debugger { diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp index 6e498c1268..e29b7c6b2e 100644 --- a/src/plugins/debugger/snapshotwindow.cpp +++ b/src/plugins/debugger/snapshotwindow.cpp @@ -41,11 +41,11 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> -#include <QtGui/QKeyEvent> +#include <QHeaderView> +#include <QMenu> +#include <QKeyEvent> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/sourceagent.cpp b/src/plugins/debugger/sourceagent.cpp index 8e4b88289f..93d09a2415 100644 --- a/src/plugins/debugger/sourceagent.cpp +++ b/src/plugins/debugger/sourceagent.cpp @@ -55,17 +55,17 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QMetaObject> -#include <QtCore/QTimer> -#include <QtCore/QPointer> -#include <QtCore/QFileInfo> - -#include <QtGui/QMessageBox> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QIcon> +#include <QDebug> +#include <QMetaObject> +#include <QTimer> +#include <QPointer> +#include <QFileInfo> + +#include <QMessageBox> +#include <QPlainTextEdit> +#include <QTextBlock> +#include <QTextCursor> +#include <QIcon> #include <limits.h> diff --git a/src/plugins/debugger/sourceagent.h b/src/plugins/debugger/sourceagent.h index 0fe487d496..020eda2ece 100644 --- a/src/plugins/debugger/sourceagent.h +++ b/src/plugins/debugger/sourceagent.h @@ -33,7 +33,7 @@ #ifndef DEBUGGER_SOURCE_AGENT_H #define DEBUGGER_SOURCE_AGENT_H -#include <QtCore/QObject> +#include <QObject> namespace Debugger { diff --git a/src/plugins/debugger/sourcefileshandler.cpp b/src/plugins/debugger/sourcefileshandler.cpp index ab7eae6203..2affe270f9 100644 --- a/src/plugins/debugger/sourcefileshandler.cpp +++ b/src/plugins/debugger/sourcefileshandler.cpp @@ -32,10 +32,10 @@ #include "sourcefileshandler.h" -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> -#include <QtGui/QSortFilterProxyModel> +#include <QSortFilterProxyModel> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/sourcefileshandler.h b/src/plugins/debugger/sourcefileshandler.h index 3edc8ff778..553277718b 100644 --- a/src/plugins/debugger/sourcefileshandler.h +++ b/src/plugins/debugger/sourcefileshandler.h @@ -33,8 +33,8 @@ #ifndef DEBUGGER_SOURCEFILESHANDLER_H #define DEBUGGER_SOURCEFILESHANDLER_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QStringList> +#include <QAbstractItemModel> +#include <QStringList> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp index 9bbd7df98c..e950ef4665 100644 --- a/src/plugins/debugger/sourcefileswindow.cpp +++ b/src/plugins/debugger/sourcefileswindow.cpp @@ -40,11 +40,11 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QMenu> +#include <QContextMenuEvent> +#include <QMenu> ////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/stackframe.cpp b/src/plugins/debugger/stackframe.cpp index 010651f487..6c4fdbb62a 100644 --- a/src/plugins/debugger/stackframe.cpp +++ b/src/plugins/debugger/stackframe.cpp @@ -32,11 +32,11 @@ #include "stackframe.h" -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QFileInfo> +#include <QDebug> +#include <QDir> +#include <QTextStream> +#include <QCoreApplication> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/stackframe.h b/src/plugins/debugger/stackframe.h index 6f76bd568b..6be47a7655 100644 --- a/src/plugins/debugger/stackframe.h +++ b/src/plugins/debugger/stackframe.h @@ -33,10 +33,10 @@ #ifndef DEBUGGER_STACKFRAME_H #define DEBUGGER_STACKFRAME_H -#include <QtCore/QList> -#include <QtCore/QMetaType> -#include <QtCore/QString> -#include <QtCore/QCoreApplication> +#include <QList> +#include <QMetaType> +#include <QString> +#include <QCoreApplication> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp index 2db4f0d026..00a3636761 100644 --- a/src/plugins/debugger/stackhandler.cpp +++ b/src/plugins/debugger/stackhandler.cpp @@ -39,8 +39,8 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/stackhandler.h b/src/plugins/debugger/stackhandler.h index 69848afb4f..b8c72b5305 100644 --- a/src/plugins/debugger/stackhandler.h +++ b/src/plugins/debugger/stackhandler.h @@ -35,7 +35,7 @@ #include "stackframe.h" -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp index 1e15027e4e..038440db88 100644 --- a/src/plugins/debugger/stackwindow.cpp +++ b/src/plugins/debugger/stackwindow.cpp @@ -42,14 +42,14 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> - -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QInputDialog> -#include <QtGui/QMenu> +#include <QDebug> + +#include <QApplication> +#include <QClipboard> +#include <QContextMenuEvent> +#include <QHeaderView> +#include <QInputDialog> +#include <QMenu> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/threaddata.h b/src/plugins/debugger/threaddata.h index 390f013334..ac9c1b655d 100644 --- a/src/plugins/debugger/threaddata.h +++ b/src/plugins/debugger/threaddata.h @@ -33,8 +33,8 @@ #ifndef THREADDATA_H #define THREADDATA_H -#include <QtCore/QVector> -#include <QtCore/QString> +#include <QVector> +#include <QString> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp index 391db1f300..b8021d7982 100644 --- a/src/plugins/debugger/threadshandler.cpp +++ b/src/plugins/debugger/threadshandler.cpp @@ -36,9 +36,9 @@ #include "debuggerconstants.h" #include "debuggercore.h" -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtGui/QSortFilterProxyModel> +#include <QDebug> +#include <QTextStream> +#include <QSortFilterProxyModel> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/threadshandler.h b/src/plugins/debugger/threadshandler.h index 5ffec44fd2..4096245e98 100644 --- a/src/plugins/debugger/threadshandler.h +++ b/src/plugins/debugger/threadshandler.h @@ -33,8 +33,8 @@ #ifndef THREADSHANDLER_H #define THREADSHANDLER_H -#include <QtCore/QAbstractTableModel> -#include <QtGui/QIcon> +#include <QAbstractTableModel> +#include <QIcon> #include "threaddata.h" diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp index afbc1f2e1f..d3065fa0ab 100644 --- a/src/plugins/debugger/threadswindow.cpp +++ b/src/plugins/debugger/threadswindow.cpp @@ -40,10 +40,10 @@ #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> +#include <QDebug> +#include <QContextMenuEvent> +#include <QHeaderView> +#include <QMenu> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp index c5231422ad..4c67bec3c7 100644 --- a/src/plugins/debugger/watchdata.cpp +++ b/src/plugins/debugger/watchdata.cpp @@ -32,8 +32,8 @@ #include "watchdata.h" -#include <QtCore/QTextStream> -#include <QtCore/QDebug> +#include <QTextStream> +#include <QDebug> //////////////////////////////////////////////////////////////////// // diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h index fceb12b75c..8d675e7f08 100644 --- a/src/plugins/debugger/watchdata.h +++ b/src/plugins/debugger/watchdata.h @@ -33,9 +33,9 @@ #ifndef DEBUGGER_WATCHDATA_H #define DEBUGGER_WATCHDATA_H -#include <QtCore/QMetaType> -#include <QtCore/QtGlobal> -#include <QtCore/QCoreApplication> +#include <QMetaType> +#include <QtGlobal> +#include <QCoreApplication> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/watchdelegatewidgets.cpp b/src/plugins/debugger/watchdelegatewidgets.cpp index 0db19205f7..6eb21e0498 100644 --- a/src/plugins/debugger/watchdelegatewidgets.cpp +++ b/src/plugins/debugger/watchdelegatewidgets.cpp @@ -32,8 +32,8 @@ #include "watchdelegatewidgets.h" -#include <QtGui/QDoubleValidator> -#include <QtCore/QDebug> +#include <QDoubleValidator> +#include <QDebug> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/watchdelegatewidgets.h b/src/plugins/debugger/watchdelegatewidgets.h index eba042ef6e..44a5499507 100644 --- a/src/plugins/debugger/watchdelegatewidgets.h +++ b/src/plugins/debugger/watchdelegatewidgets.h @@ -33,9 +33,9 @@ #ifndef WATCHDELEGATEEDITS_H #define WATCHDELEGATEEDITS_H -#include <QtGui/QLineEdit> -#include <QtGui/QComboBox> -#include <QtCore/QVariant> +#include <QLineEdit> +#include <QComboBox> +#include <QVariant> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index b0434b92bd..5215cf8c47 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -49,15 +49,15 @@ #include <cplusplus/CppRewriter.h> -#include <QtCore/QDebug> -#include <QtCore/QEvent> -#include <QtCore/QFile> -#include <QtCore/QProcess> -#include <QtCore/QTextStream> -#include <QtCore/QtAlgorithms> - -#include <QtGui/QLabel> -#include <QtGui/QTextEdit> +#include <QDebug> +#include <QEvent> +#include <QFile> +#include <QProcess> +#include <QTextStream> +#include <QtAlgorithms> + +#include <QLabel> +#include <QTextEdit> #include <ctype.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h index 3922d6866e..5af4b463a4 100644 --- a/src/plugins/debugger/watchhandler.h +++ b/src/plugins/debugger/watchhandler.h @@ -35,11 +35,11 @@ #include "watchdata.h" -#include <QtCore/QPointer> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QStringList> -#include <QtCore/QAbstractItemModel> +#include <QPointer> +#include <QHash> +#include <QSet> +#include <QStringList> +#include <QAbstractItemModel> namespace Debugger { class DebuggerEngine; diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp index 9252822772..8b3672d08a 100644 --- a/src/plugins/debugger/watchutils.cpp +++ b/src/plugins/debugger/watchutils.cpp @@ -55,16 +55,16 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> -#include <QtCore/QTime> - -#include <QtGui/QTextCursor> -#include <QtGui/QPlainTextEdit> +#include <QCoreApplication> +#include <QDateTime> +#include <QDebug> +#include <QHash> +#include <QStringList> +#include <QTextStream> +#include <QTime> + +#include <QTextCursor> +#include <QPlainTextEdit> #include <string.h> #include <ctype.h> diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h index fb55038e46..d77f943ad2 100644 --- a/src/plugins/debugger/watchutils.h +++ b/src/plugins/debugger/watchutils.h @@ -32,8 +32,8 @@ #ifndef WATCHUTILS_H #define WATCHUTILS_H -#include <QtCore/QSet> -#include <QtCore/QString> +#include <QSet> +#include <QString> namespace TextEditor { class ITextEditor; diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp index e82aebdb3a..c773a62ef8 100644 --- a/src/plugins/debugger/watchwindow.cpp +++ b/src/plugins/debugger/watchwindow.cpp @@ -49,22 +49,22 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> -#include <QtCore/QDebug> -#include <QtCore/QMetaObject> -#include <QtCore/QMetaProperty> -#include <QtCore/QVariant> -#include <QtCore/QMimeData> - -#include <QtGui/QApplication> -#include <QtGui/QPalette> -#include <QtGui/QClipboard> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QItemDelegate> -#include <QtGui/QMenu> -#include <QtGui/QPainter> -#include <QtGui/QInputDialog> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QMetaObject> +#include <QMetaProperty> +#include <QVariant> +#include <QMimeData> + +#include <QApplication> +#include <QPalette> +#include <QClipboard> +#include <QContextMenuEvent> +#include <QHeaderView> +#include <QItemDelegate> +#include <QMenu> +#include <QPainter> +#include <QInputDialog> +#include <QMessageBox> ///////////////////////////////////////////////////////////////////// // |