diff options
Diffstat (limited to 'src/plugins/valgrind')
72 files changed, 210 insertions, 210 deletions
diff --git a/src/plugins/valgrind/callgrind/callgrindabstractmodel.h b/src/plugins/valgrind/callgrind/callgrindabstractmodel.h index eb0e065d34..5d6a6657e4 100644 --- a/src/plugins/valgrind/callgrind/callgrindabstractmodel.h +++ b/src/plugins/valgrind/callgrind/callgrindabstractmodel.h @@ -33,7 +33,7 @@ #ifndef LIBVALGRIND_CALLGRINDABSTRACTMODEL_H #define LIBVALGRIND_CALLGRINDABSTRACTMODEL_H -#include <QtGui/QAbstractItemView> +#include <QAbstractItemView> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindcallmodel.h b/src/plugins/valgrind/callgrind/callgrindcallmodel.h index fd980af47f..0047f11804 100644 --- a/src/plugins/valgrind/callgrind/callgrindcallmodel.h +++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.h @@ -33,7 +33,7 @@ #ifndef VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H #define VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> #include "callgrindabstractmodel.h" diff --git a/src/plugins/valgrind/callgrind/callgrindcostitem.cpp b/src/plugins/valgrind/callgrind/callgrindcostitem.cpp index a77cdcf846..d2683be447 100644 --- a/src/plugins/valgrind/callgrind/callgrindcostitem.cpp +++ b/src/plugins/valgrind/callgrind/callgrindcostitem.cpp @@ -32,9 +32,9 @@ #include "callgrindcostitem.h" -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QString> +#include <QStringList> +#include <QVector> #include "callgrindparsedata.h" #include "callgrindfunctioncall.h" diff --git a/src/plugins/valgrind/callgrind/callgrindcostitem.h b/src/plugins/valgrind/callgrind/callgrindcostitem.h index cf370d2c98..be7e7a10e4 100644 --- a/src/plugins/valgrind/callgrind/callgrindcostitem.h +++ b/src/plugins/valgrind/callgrind/callgrindcostitem.h @@ -33,7 +33,7 @@ #ifndef LIBVALGRIND_CALLGRIND_COSTITEM_H #define LIBVALGRIND_CALLGRIND_COSTITEM_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp index 4bae3a6ae7..f7e1ab1e64 100644 --- a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp +++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp @@ -39,7 +39,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> +#include <QDebug> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindcycledetection.h b/src/plugins/valgrind/callgrind/callgrindcycledetection.h index 4b6be5a994..dac75894f6 100644 --- a/src/plugins/valgrind/callgrind/callgrindcycledetection.h +++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.h @@ -33,8 +33,8 @@ #ifndef LIBVALGRIND_CALLGRINDCYCLEDETECTION_H #define LIBVALGRIND_CALLGRINDCYCLEDETECTION_H -#include <QtCore/QHash> -#include <QtCore/QStack> +#include <QHash> +#include <QStack> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp index 7578c39165..7f93b77767 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp @@ -38,10 +38,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QChar> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QChar> +#include <QDebug> +#include <QStringList> +#include <QVector> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.h b/src/plugins/valgrind/callgrind/callgrinddatamodel.h index dcf0be8e8c..429ad14d59 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.h +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.h @@ -35,7 +35,7 @@ #include "callgrindabstractmodel.h" -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp index 1223f8cf04..d218d774a4 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction.cpp +++ b/src/plugins/valgrind/callgrind/callgrindfunction.cpp @@ -39,11 +39,11 @@ #include <utils/qtcassert.h> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> +#include <QString> +#include <QStringList> +#include <QDebug> +#include <QFileInfo> +#include <QCoreApplication> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.h b/src/plugins/valgrind/callgrind/callgrindfunction.h index 70d333112d..49bf9500f5 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction.h +++ b/src/plugins/valgrind/callgrind/callgrindfunction.h @@ -33,8 +33,8 @@ #ifndef LIBVALGRIND_CALLGRIND_FUNCTION_H #define LIBVALGRIND_CALLGRIND_FUNCTION_H -#include <QtCore/QMetaType> -#include <QtCore/QVector> +#include <QMetaType> +#include <QVector> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunction_p.h b/src/plugins/valgrind/callgrind/callgrindfunction_p.h index e4031e74da..9b90e6f44f 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction_p.h +++ b/src/plugins/valgrind/callgrind/callgrindfunction_p.h @@ -38,8 +38,8 @@ #include "callgrindcostitem.h" #include "callgrindfunctioncall.h" -#include <QtCore/QVector> -#include <QtCore/QHash> +#include <QVector> +#include <QHash> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp b/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp index f396bcff99..412065936d 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp +++ b/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QVector> +#include <QVector> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncall.h b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h index 41e6a65ab8..3a90ac826b 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunctioncall.h +++ b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h @@ -33,7 +33,7 @@ #ifndef LIBVALGRIND_CALLGRIND_CALLEE_H #define LIBVALGRIND_CALLGRIND_CALLEE_H -#include <QtCore/QMetaType> +#include <QMetaType> QT_BEGIN_NAMESPACE template <typename T> class QVector; diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp index 1e0bf0c427..a57dbcc82c 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp +++ b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp @@ -36,8 +36,8 @@ #include "callgrindfunctioncall.h" #include "callgrindparsedata.h" -#include <QtCore/QStringList> -#include <QtCore/QDebug> +#include <QStringList> +#include <QDebug> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp index 351a434c57..4964b9a5b9 100644 --- a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp @@ -38,10 +38,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QStringList> -#include <QtCore/QVector> -#include <QtCore/QHash> -#include <QtCore/QCoreApplication> +#include <QStringList> +#include <QVector> +#include <QHash> +#include <QCoreApplication> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.h b/src/plugins/valgrind/callgrind/callgrindparsedata.h index 0982ac2009..21f9e6f246 100644 --- a/src/plugins/valgrind/callgrind/callgrindparsedata.h +++ b/src/plugins/valgrind/callgrind/callgrindparsedata.h @@ -33,7 +33,7 @@ #ifndef LIBVALGRIND_CALLGRIND_PARSEDATA_P_H #define LIBVALGRIND_CALLGRIND_PARSEDATA_P_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp index fb55c2d7e4..b2025a6141 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp @@ -39,10 +39,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QHash> -#include <QtCore/QVector> -#include <QtCore/QStringList> -#include <QtCore/QDebug> +#include <QHash> +#include <QVector> +#include <QStringList> +#include <QDebug> // #define DEBUG_PARSER diff --git a/src/plugins/valgrind/callgrind/callgrindrunner.cpp b/src/plugins/valgrind/callgrind/callgrindrunner.cpp index 9c50cba366..127dfa72a9 100644 --- a/src/plugins/valgrind/callgrind/callgrindrunner.cpp +++ b/src/plugins/valgrind/callgrind/callgrindrunner.cpp @@ -35,7 +35,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QFile> +#include <QFile> namespace Valgrind { namespace Callgrind { diff --git a/src/plugins/valgrind/callgrindcostdelegate.cpp b/src/plugins/valgrind/callgrindcostdelegate.cpp index 8857a63509..b8aea6f9eb 100644 --- a/src/plugins/valgrind/callgrindcostdelegate.cpp +++ b/src/plugins/valgrind/callgrindcostdelegate.cpp @@ -40,8 +40,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QApplication> -#include <QtGui/QPainter> +#include <QApplication> +#include <QPainter> using namespace Valgrind::Callgrind; diff --git a/src/plugins/valgrind/callgrindcostdelegate.h b/src/plugins/valgrind/callgrindcostdelegate.h index 85e640f4f7..615aeaa9e6 100644 --- a/src/plugins/valgrind/callgrindcostdelegate.h +++ b/src/plugins/valgrind/callgrindcostdelegate.h @@ -33,7 +33,7 @@ #ifndef CALLGRINDCOSTDELEGATE_H #define CALLGRINDCOSTDELEGATE_H -#include <QtGui/QStyledItemDelegate> +#include <QStyledItemDelegate> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindcostview.cpp b/src/plugins/valgrind/callgrindcostview.cpp index ff768d8072..6f03017a4e 100644 --- a/src/plugins/valgrind/callgrindcostview.cpp +++ b/src/plugins/valgrind/callgrindcostview.cpp @@ -39,9 +39,9 @@ #include <valgrind/callgrind/callgrindfunction.h> #include <valgrind/callgrind/callgrindcallmodel.h> -#include <QtGui/QAbstractProxyModel> -#include <QtGui/QHeaderView> -#include <QtCore/QDebug> +#include <QAbstractProxyModel> +#include <QHeaderView> +#include <QDebug> using namespace Valgrind::Callgrind; diff --git a/src/plugins/valgrind/callgrindcostview.h b/src/plugins/valgrind/callgrindcostview.h index 22f3dfbd0c..d58e30a0dd 100644 --- a/src/plugins/valgrind/callgrindcostview.h +++ b/src/plugins/valgrind/callgrindcostview.h @@ -35,7 +35,7 @@ #include "callgrindcostdelegate.h" -#include <QtGui/QTreeView> +#include <QTreeView> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindhelper.cpp b/src/plugins/valgrind/callgrindhelper.cpp index 3918c1d23c..511da71bc0 100644 --- a/src/plugins/valgrind/callgrindhelper.cpp +++ b/src/plugins/valgrind/callgrindhelper.cpp @@ -34,9 +34,9 @@ #include <cstdlib> -#include <QtGui/QColor> -#include <QtCore/QMap> -#include <QtCore/QString> +#include <QColor> +#include <QMap> +#include <QString> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindhelper.h b/src/plugins/valgrind/callgrindhelper.h index fbf66ca1ac..43c5e4c589 100644 --- a/src/plugins/valgrind/callgrindhelper.h +++ b/src/plugins/valgrind/callgrindhelper.h @@ -33,7 +33,7 @@ #ifndef CALLGRINDHELPER_H #define CALLGRINDHELPER_H -#include <QtCore/QLocale> +#include <QLocale> QT_BEGIN_NAMESPACE class QColor; diff --git a/src/plugins/valgrind/callgrindnamedelegate.cpp b/src/plugins/valgrind/callgrindnamedelegate.cpp index 9bef2483df..a88b9e7a5c 100644 --- a/src/plugins/valgrind/callgrindnamedelegate.cpp +++ b/src/plugins/valgrind/callgrindnamedelegate.cpp @@ -34,8 +34,8 @@ #include "callgrindhelper.h" -#include <QtGui/QApplication> -#include <QtGui/QPainter> +#include <QApplication> +#include <QPainter> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindnamedelegate.h b/src/plugins/valgrind/callgrindnamedelegate.h index d14afe7f0e..171da5b371 100644 --- a/src/plugins/valgrind/callgrindnamedelegate.h +++ b/src/plugins/valgrind/callgrindnamedelegate.h @@ -33,7 +33,7 @@ #ifndef CALLGRINDNAMEDELEGATE_H #define CALLGRINDNAMEDELEGATE_H -#include <QtGui/QStyledItemDelegate> +#include <QStyledItemDelegate> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindtextmark.cpp b/src/plugins/valgrind/callgrindtextmark.cpp index 5a8abde5eb..aa524442d9 100644 --- a/src/plugins/valgrind/callgrindtextmark.cpp +++ b/src/plugins/valgrind/callgrindtextmark.cpp @@ -37,8 +37,8 @@ #include "callgrind/callgrinddatamodel.h" #include "callgrind/callgrindfunction.h" -#include <QtCore/QDebug> -#include <QtGui/QPainter> +#include <QDebug> +#include <QPainter> #include <utils/qtcassert.h> diff --git a/src/plugins/valgrind/callgrindtextmark.h b/src/plugins/valgrind/callgrindtextmark.h index e7d016b557..effd57ae58 100644 --- a/src/plugins/valgrind/callgrindtextmark.h +++ b/src/plugins/valgrind/callgrindtextmark.h @@ -35,7 +35,7 @@ #include <texteditor/basetextmark.h> -#include <QtCore/QPersistentModelIndex> +#include <QPersistentModelIndex> namespace Valgrind { diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 81261ef513..dd3287f251 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -74,23 +74,23 @@ #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> - -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QDockWidget> -#include <QtGui/QGraphicsItem> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QMenu> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QVBoxLayout> +#include <QFile> +#include <QFileInfo> +#include <QTimer> + +#include <QAction> +#include <QActionGroup> +#include <QCheckBox> +#include <QComboBox> +#include <QDockWidget> +#include <QGraphicsItem> +#include <QHBoxLayout> +#include <QLineEdit> +#include <QMenu> +#include <QSortFilterProxyModel> +#include <QToolBar> +#include <QToolButton> +#include <QVBoxLayout> // shared/cplusplus includes #include <Symbols.h> diff --git a/src/plugins/valgrind/callgrindvisualisation.cpp b/src/plugins/valgrind/callgrindvisualisation.cpp index fa616f151c..3a43d45f4b 100644 --- a/src/plugins/valgrind/callgrindvisualisation.cpp +++ b/src/plugins/valgrind/callgrindvisualisation.cpp @@ -40,17 +40,17 @@ #include <valgrind/callgrind/callgrindproxymodel.h> #include <utils/qtcassert.h> -#include <QtGui/QGraphicsRectItem> -#include <QtGui/QGraphicsScene> -#include <QtGui/QGraphicsSimpleTextItem> -#include <QtGui/QMouseEvent> -#include <QtGui/QStaticText> -#include <QtGui/QStyleOptionGraphicsItem> -#include <QtCore/QPair> -#include <QtCore/QPersistentModelIndex> -#include <QtCore/QLinkedList> -#include <QtCore/QAbstractItemModel> -#include <QtCore/QDebug> +#include <QGraphicsRectItem> +#include <QGraphicsScene> +#include <QGraphicsSimpleTextItem> +#include <QMouseEvent> +#include <QStaticText> +#include <QStyleOptionGraphicsItem> +#include <QPair> +#include <QPersistentModelIndex> +#include <QLinkedList> +#include <QAbstractItemModel> +#include <QDebug> #define VISUALISATION_DEBUG 0 // Margin from hardcoded value in: diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h index 8067e3c4fc..ec059ad3d5 100644 --- a/src/plugins/valgrind/callgrindvisualisation.h +++ b/src/plugins/valgrind/callgrindvisualisation.h @@ -33,7 +33,7 @@ #ifndef CALLGRINDVISUALISATION_H #define CALLGRINDVISUALISATION_H -#include <QtGui/QGraphicsView> +#include <QGraphicsView> QT_BEGIN_NAMESPACE class QAbstractItemModel; diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.cpp b/src/plugins/valgrind/memcheck/memcheckrunner.cpp index 62154d6ab0..d48d85d767 100644 --- a/src/plugins/valgrind/memcheck/memcheckrunner.cpp +++ b/src/plugins/valgrind/memcheck/memcheckrunner.cpp @@ -40,16 +40,16 @@ #include <utils/qtcassert.h> -#include <QtNetwork/QNetworkInterface> -#include <QtNetwork/QTcpServer> -#include <QtNetwork/QTcpSocket> -#include <QtCore/QEventLoop> -#include <QtGui/QApplication> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLabel> -#include <QtGui/QListWidget> -#include <QtGui/QVBoxLayout> +#include <QNetworkInterface> +#include <QTcpServer> +#include <QTcpSocket> +#include <QEventLoop> +#include <QApplication> +#include <QDialog> +#include <QDialogButtonBox> +#include <QLabel> +#include <QListWidget> +#include <QVBoxLayout> namespace Valgrind { namespace Memcheck { diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index 61dd919f9c..fcecff6680 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -50,20 +50,20 @@ #include <texteditor/basetexteditor.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QDebug> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QLabel> -#include <QtGui/QListView> -#include <QtGui/QMenu> -#include <QtGui/QPainter> -#include <QtGui/QScrollBar> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QStyledItemDelegate> -#include <QtGui/QVBoxLayout> +#include <QDir> +#include <QDebug> + +#include <QAction> +#include <QApplication> +#include <QClipboard> +#include <QLabel> +#include <QListView> +#include <QMenu> +#include <QPainter> +#include <QScrollBar> +#include <QSortFilterProxyModel> +#include <QStyledItemDelegate> +#include <QVBoxLayout> using namespace Valgrind::XmlProtocol; diff --git a/src/plugins/valgrind/memcheckerrorview.h b/src/plugins/valgrind/memcheckerrorview.h index 6aa10ccf5e..1c00316a03 100644 --- a/src/plugins/valgrind/memcheckerrorview.h +++ b/src/plugins/valgrind/memcheckerrorview.h @@ -35,7 +35,7 @@ #ifndef MEMCHECKERRORVIEW_H #define MEMCHECKERRORVIEW_H -#include <QtGui/QListView> +#include <QListView> namespace Analyzer { class AnalyzerSettings; } diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 358155f1a5..e93b10353d 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -71,22 +71,22 @@ #include <utils/styledbar.h> #include <utils/qtcassert.h> -#include <QtCore/QString> -#include <QtCore/QLatin1String> -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtCore/QDir> - -#include <QtGui/QDockWidget> -#include <QtGui/QHBoxLayout> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> -#include <QtGui/QSpinBox> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QToolButton> -#include <QtGui/QCheckBox> +#include <QString> +#include <QLatin1String> +#include <QFileInfo> +#include <QFile> +#include <QDir> + +#include <QDockWidget> +#include <QHBoxLayout> +#include <QComboBox> +#include <QLabel> +#include <QSpinBox> +#include <QAction> +#include <QMenu> +#include <QMessageBox> +#include <QToolButton> +#include <QCheckBox> #include <utils/stylehelper.h> using namespace Analyzer; diff --git a/src/plugins/valgrind/memchecktool.h b/src/plugins/valgrind/memchecktool.h index 25d0b997ad..52339735d8 100644 --- a/src/plugins/valgrind/memchecktool.h +++ b/src/plugins/valgrind/memchecktool.h @@ -37,8 +37,8 @@ #include "valgrindtool.h" -#include <QtGui/QSortFilterProxyModel> -#include <QtCore/QSharedPointer> +#include <QSortFilterProxyModel> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QItemSelection; diff --git a/src/plugins/valgrind/suppressiondialog.cpp b/src/plugins/valgrind/suppressiondialog.cpp index a0e43656e9..c61c14104b 100644 --- a/src/plugins/valgrind/suppressiondialog.cpp +++ b/src/plugins/valgrind/suppressiondialog.cpp @@ -51,13 +51,13 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QFile> +#include <QFile> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QFormLayout> -#include <QtGui/QPushButton> -#include <QtGui/QLabel> -#include <QtGui/QPlainTextEdit> +#include <QDialogButtonBox> +#include <QFormLayout> +#include <QPushButton> +#include <QLabel> +#include <QPlainTextEdit> using namespace Analyzer; using namespace Valgrind::XmlProtocol; diff --git a/src/plugins/valgrind/suppressiondialog.h b/src/plugins/valgrind/suppressiondialog.h index b3533ee6c0..5ce198355e 100644 --- a/src/plugins/valgrind/suppressiondialog.h +++ b/src/plugins/valgrind/suppressiondialog.h @@ -39,7 +39,7 @@ #include <utils/pathchooser.h> -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QPlainTextEdit; diff --git a/src/plugins/valgrind/valgrindconfigwidget.cpp b/src/plugins/valgrind/valgrindconfigwidget.cpp index d4a8d4df00..8eb794e26a 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.cpp +++ b/src/plugins/valgrind/valgrindconfigwidget.cpp @@ -39,10 +39,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QStandardItemModel> -#include <QtGui/QFileDialog> +#include <QStandardItemModel> +#include <QFileDialog> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h index 1593b7005c..962bb88979 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.h +++ b/src/plugins/valgrind/valgrindconfigwidget.h @@ -35,7 +35,7 @@ #ifndef ANALYZER_VALGRINDCONFIGWIDGET_H #define ANALYZER_VALGRINDCONFIGWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 7cc70ca9f7..ce62cec6f3 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -43,8 +43,8 @@ #include <projectexplorer/applicationrunconfiguration.h> #include <analyzerbase/analyzermanager.h> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> +#include <QApplication> +#include <QMainWindow> #define VALGRIND_DEBUG_OUTPUT 0 diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h index e93967040f..e8ba1bcf85 100644 --- a/src/plugins/valgrind/valgrindengine.h +++ b/src/plugins/valgrind/valgrindengine.h @@ -41,10 +41,10 @@ #include <valgrind/valgrindrunner.h> -#include <QtCore/QString> -#include <QtCore/QByteArray> -#include <QtCore/QFutureInterface> -#include <QtCore/QFutureWatcher> +#include <QString> +#include <QByteArray> +#include <QFutureInterface> +#include <QFutureWatcher> namespace Analyzer { class AnalyzerSettings; diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp index a2c6169de5..43c1b2e275 100644 --- a/src/plugins/valgrind/valgrindplugin.cpp +++ b/src/plugins/valgrind/valgrindplugin.cpp @@ -52,10 +52,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> +#include <QDebug> +#include <QStringList> +#include <QtPlugin> +#include <QAction> using namespace Analyzer; using namespace ProjectExplorer; diff --git a/src/plugins/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp index 3e2ddb2a93..8ae5bc20a8 100644 --- a/src/plugins/valgrind/valgrindprocess.cpp +++ b/src/plugins/valgrind/valgrindprocess.cpp @@ -34,14 +34,14 @@ #include "valgrindprocess.h" -#include <QtCore/QDebug> -#include <QtCore/QEventLoop> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QEventLoop> +#include <QFileInfo> #include <utils/qtcassert.h> #ifdef Q_OS_WIN -# include <QtCore/qt_windows.h> +# include <qt_windows.h> #endif namespace Valgrind { diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index afe1f93e70..2c7e8e1c82 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/src/plugins/valgrind/valgrindrunner.cpp @@ -41,7 +41,7 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocess.h> -#include <QtCore/QEventLoop> +#include <QEventLoop> namespace Valgrind { diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h index 5d77afc742..1531024cef 100644 --- a/src/plugins/valgrind/valgrindrunner.h +++ b/src/plugins/valgrind/valgrindrunner.h @@ -40,7 +40,7 @@ #include <utils/outputformat.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QProcess> +#include <QProcess> namespace Utils { class Environment; diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp index 8a5fa10f19..ea60061115 100644 --- a/src/plugins/valgrind/valgrindsettings.cpp +++ b/src/plugins/valgrind/valgrindsettings.cpp @@ -39,8 +39,8 @@ #include <utils/qtcassert.h> #include <valgrind/xmlprotocol/error.h> -#include <QtCore/QSettings> -#include <QtCore/QDebug> +#include <QSettings> +#include <QDebug> using namespace Analyzer; diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h index 1c8eed49e1..fbafa135e6 100644 --- a/src/plugins/valgrind/valgrindsettings.h +++ b/src/plugins/valgrind/valgrindsettings.h @@ -38,9 +38,9 @@ #include <analyzerbase/analyzersettings.h> #include "callgrindcostdelegate.h" -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QVariant> +#include <QObject> +#include <QString> +#include <QVariant> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/workarounds.cpp b/src/plugins/valgrind/workarounds.cpp index 532b415a22..5bf131834d 100644 --- a/src/plugins/valgrind/workarounds.cpp +++ b/src/plugins/valgrind/workarounds.cpp @@ -32,7 +32,7 @@ #include "workarounds.h" -#include <QtGui/QPalette> +#include <QPalette> #include <utils/stylehelper.h> diff --git a/src/plugins/valgrind/workarounds.h b/src/plugins/valgrind/workarounds.h index 27c0996c19..b83b615841 100644 --- a/src/plugins/valgrind/workarounds.h +++ b/src/plugins/valgrind/workarounds.h @@ -33,7 +33,7 @@ #ifndef WORKAROUNDS_H #define WORKAROUNDS_H -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE class QPalette; diff --git a/src/plugins/valgrind/xmlprotocol/announcethread.cpp b/src/plugins/valgrind/xmlprotocol/announcethread.cpp index dca5af7804..351fc6c0cb 100644 --- a/src/plugins/valgrind/xmlprotocol/announcethread.cpp +++ b/src/plugins/valgrind/xmlprotocol/announcethread.cpp @@ -35,8 +35,8 @@ #include "announcethread.h" #include "frame.h" -#include <QtCore/QSharedData> -#include <QtCore/QVector> +#include <QSharedData> +#include <QVector> #include <algorithm> diff --git a/src/plugins/valgrind/xmlprotocol/announcethread.h b/src/plugins/valgrind/xmlprotocol/announcethread.h index 04427993a3..0d6eb952c8 100644 --- a/src/plugins/valgrind/xmlprotocol/announcethread.h +++ b/src/plugins/valgrind/xmlprotocol/announcethread.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H #define LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE template <typename T> class QVector; diff --git a/src/plugins/valgrind/xmlprotocol/error.cpp b/src/plugins/valgrind/xmlprotocol/error.cpp index 3e09c6d8c1..3d4ec6fa73 100644 --- a/src/plugins/valgrind/xmlprotocol/error.cpp +++ b/src/plugins/valgrind/xmlprotocol/error.cpp @@ -37,12 +37,12 @@ #include "stack.h" #include "suppression.h" -#include <QtCore/QSharedData> -#include <QtCore/QString> -#include <QtCore/QTextStream> -#include <QtCore/QVector> +#include <QSharedData> +#include <QString> +#include <QTextStream> +#include <QVector> -#include <QtCore/QtAlgorithms> +#include <QtAlgorithms> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/error.h b/src/plugins/valgrind/xmlprotocol/error.h index 98431fbb5a..1f8e0b66ca 100644 --- a/src/plugins/valgrind/xmlprotocol/error.h +++ b/src/plugins/valgrind/xmlprotocol/error.h @@ -35,8 +35,8 @@ #ifndef LIBVALGRIND_PROTOCOL_ERROR_H #define LIBVALGRIND_PROTOCOL_ERROR_H -#include <QtCore/QMetaType> -#include <QtCore/QSharedDataPointer> +#include <QMetaType> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp index a11977ba5d..44ea8f3f4b 100644 --- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp +++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp @@ -40,8 +40,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QVector> +#include <QDir> +#include <QVector> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h index bdcd069c9d..98d4e5cdb8 100644 --- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h +++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h @@ -35,8 +35,8 @@ #ifndef LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H #define LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QSharedPointer> +#include <QAbstractItemModel> +#include <QSharedPointer> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/frame.cpp b/src/plugins/valgrind/xmlprotocol/frame.cpp index dd21dad135..4dde5861ae 100644 --- a/src/plugins/valgrind/xmlprotocol/frame.cpp +++ b/src/plugins/valgrind/xmlprotocol/frame.cpp @@ -34,8 +34,8 @@ #include "frame.h" -#include <QtCore/QString> -#include <QtCore/QtAlgorithms> +#include <QString> +#include <QtAlgorithms> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/frame.h b/src/plugins/valgrind/xmlprotocol/frame.h index 651bd4f2af..543072f2f8 100644 --- a/src/plugins/valgrind/xmlprotocol/frame.h +++ b/src/plugins/valgrind/xmlprotocol/frame.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_FRAME_H #define LIBVALGRIND_PROTOCOL_FRAME_H -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp index b63771ef63..f3006fc3a1 100644 --- a/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp +++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp @@ -35,10 +35,10 @@ #include "modelhelpers.h" #include "frame.h" -#include <QtCore/QString> -#include <QtCore/QDir> -#include <QtCore/QPair> -#include <QtCore/QCoreApplication> +#include <QString> +#include <QDir> +#include <QPair> +#include <QCoreApplication> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/modelhelpers.h b/src/plugins/valgrind/xmlprotocol/modelhelpers.h index 1e41adb018..d9704bd060 100644 --- a/src/plugins/valgrind/xmlprotocol/modelhelpers.h +++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_MODELHELPERS_H #define LIBVALGRIND_PROTOCOL_MODELHELPERS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp index f434c01e06..a49f6654d3 100644 --- a/src/plugins/valgrind/xmlprotocol/parser.cpp +++ b/src/plugins/valgrind/xmlprotocol/parser.cpp @@ -41,13 +41,13 @@ #include "suppression.h" #include <utils/qtcassert.h> -#include <QtNetwork/QAbstractSocket> -#include <QtCore/QCoreApplication> -#include <QtCore/QHash> -#include <QtCore/QIODevice> -#include <QtCore/QPair> -#include <QtCore/QThread> -#include <QtCore/QXmlStreamReader> +#include <QAbstractSocket> +#include <QCoreApplication> +#include <QHash> +#include <QIODevice> +#include <QPair> +#include <QThread> +#include <QXmlStreamReader> namespace { diff --git a/src/plugins/valgrind/xmlprotocol/parser.h b/src/plugins/valgrind/xmlprotocol/parser.h index 15994f8688..17a2e771ab 100644 --- a/src/plugins/valgrind/xmlprotocol/parser.h +++ b/src/plugins/valgrind/xmlprotocol/parser.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_PARSER_H #define LIBVALGRIND_PROTOCOL_PARSER_H -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/plugins/valgrind/xmlprotocol/stack.cpp b/src/plugins/valgrind/xmlprotocol/stack.cpp index 287c044fb8..442df446c1 100644 --- a/src/plugins/valgrind/xmlprotocol/stack.cpp +++ b/src/plugins/valgrind/xmlprotocol/stack.cpp @@ -35,9 +35,9 @@ #include "stack.h" #include "frame.h" -#include <QtCore/QSharedData> -#include <QtCore/QString> -#include <QtCore/QVector> +#include <QSharedData> +#include <QString> +#include <QVector> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/stack.h b/src/plugins/valgrind/xmlprotocol/stack.h index 09df809c08..56c9fc02f0 100644 --- a/src/plugins/valgrind/xmlprotocol/stack.h +++ b/src/plugins/valgrind/xmlprotocol/stack.h @@ -35,7 +35,7 @@ #ifndef VALGRIND_PROTOCOL_STACK_H #define VALGRIND_PROTOCOL_STACK_H -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE template <typename T> class QVector; diff --git a/src/plugins/valgrind/xmlprotocol/stackmodel.cpp b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp index 980f138dce..2c49b70e06 100644 --- a/src/plugins/valgrind/xmlprotocol/stackmodel.cpp +++ b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp @@ -40,8 +40,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QVector> +#include <QDir> +#include <QVector> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/stackmodel.h b/src/plugins/valgrind/xmlprotocol/stackmodel.h index 306ea613c5..5601410292 100644 --- a/src/plugins/valgrind/xmlprotocol/stackmodel.h +++ b/src/plugins/valgrind/xmlprotocol/stackmodel.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_STACKMODEL_H #define LIBVALGRIND_PROTOCOL_STACKMODEL_H -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/status.cpp b/src/plugins/valgrind/xmlprotocol/status.cpp index 91094bd6ba..cab522ed15 100644 --- a/src/plugins/valgrind/xmlprotocol/status.cpp +++ b/src/plugins/valgrind/xmlprotocol/status.cpp @@ -34,8 +34,8 @@ #include "status.h" -#include <QtCore/QSharedData> -#include <QtCore/QString> +#include <QSharedData> +#include <QString> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/status.h b/src/plugins/valgrind/xmlprotocol/status.h index a33b02e111..46d971b522 100644 --- a/src/plugins/valgrind/xmlprotocol/status.h +++ b/src/plugins/valgrind/xmlprotocol/status.h @@ -35,8 +35,8 @@ #ifndef LIBVALGRIND_PROTOCOL_STATUS_H #define LIBVALGRIND_PROTOCOL_STATUS_H -#include <QtCore/QMetaType> -#include <QtCore/QSharedDataPointer> +#include <QMetaType> +#include <QSharedDataPointer> namespace Valgrind { namespace XmlProtocol { diff --git a/src/plugins/valgrind/xmlprotocol/suppression.cpp b/src/plugins/valgrind/xmlprotocol/suppression.cpp index 412215a662..a1ef9611c6 100644 --- a/src/plugins/valgrind/xmlprotocol/suppression.cpp +++ b/src/plugins/valgrind/xmlprotocol/suppression.cpp @@ -34,10 +34,10 @@ #include "suppression.h" -#include <QtCore/QSharedData> -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtCore/QTextStream> +#include <QSharedData> +#include <QString> +#include <QVector> +#include <QTextStream> #include <algorithm> diff --git a/src/plugins/valgrind/xmlprotocol/suppression.h b/src/plugins/valgrind/xmlprotocol/suppression.h index 4fdcb8fb43..5d7c6340e6 100644 --- a/src/plugins/valgrind/xmlprotocol/suppression.h +++ b/src/plugins/valgrind/xmlprotocol/suppression.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_SUPPRESSION_H #define LIBVALGRIND_PROTOCOL_SUPPRESSION_H -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/valgrind/xmlprotocol/threadedparser.cpp b/src/plugins/valgrind/xmlprotocol/threadedparser.cpp index 98790ac2dc..4d5acf855b 100644 --- a/src/plugins/valgrind/xmlprotocol/threadedparser.cpp +++ b/src/plugins/valgrind/xmlprotocol/threadedparser.cpp @@ -40,9 +40,9 @@ #include "suppression.h" #include <utils/qtcassert.h> -#include <QtCore/QMetaType> -#include <QtCore/QThread> -#include <QtCore/QSharedPointer> +#include <QMetaType> +#include <QThread> +#include <QSharedPointer> namespace { diff --git a/src/plugins/valgrind/xmlprotocol/threadedparser.h b/src/plugins/valgrind/xmlprotocol/threadedparser.h index c0e5ba2271..afaa1a773b 100644 --- a/src/plugins/valgrind/xmlprotocol/threadedparser.h +++ b/src/plugins/valgrind/xmlprotocol/threadedparser.h @@ -35,7 +35,7 @@ #ifndef LIBVALGRIND_PROTOCOL_THREADEDPARSER_H #define LIBVALGRIND_PROTOCOL_THREADEDPARSER_H -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QIODevice; |