From 3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Wed, 15 Feb 2012 10:42:41 +0100
Subject: Removed module names from #include directives.

Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
 .../coreplugin/dialogs/externaltoolconfig.cpp      | 10 +++---
 .../coreplugin/dialogs/externaltoolconfig.h        |  4 +--
 src/plugins/coreplugin/dialogs/ioptionspage.h      |  2 +-
 src/plugins/coreplugin/dialogs/iwizard.cpp         |  2 +-
 src/plugins/coreplugin/dialogs/iwizard.h           |  2 +-
 src/plugins/coreplugin/dialogs/newdialog.cpp       | 18 +++++-----
 src/plugins/coreplugin/dialogs/newdialog.h         |  8 ++---
 src/plugins/coreplugin/dialogs/openwithdialog.cpp  |  6 ++--
 src/plugins/coreplugin/dialogs/openwithdialog.h    |  2 +-
 .../coreplugin/dialogs/promptoverwritedialog.cpp   | 16 ++++-----
 .../coreplugin/dialogs/promptoverwritedialog.h     |  2 +-
 src/plugins/coreplugin/dialogs/saveitemsdialog.cpp | 12 +++----
 src/plugins/coreplugin/dialogs/saveitemsdialog.h   |  4 +--
 src/plugins/coreplugin/dialogs/settingsdialog.cpp  | 42 +++++++++++-----------
 src/plugins/coreplugin/dialogs/settingsdialog.h    | 10 +++---
 .../coreplugin/dialogs/shortcutsettings.cpp        | 18 +++++-----
 src/plugins/coreplugin/dialogs/shortcutsettings.h  |  2 +-
 17 files changed, 80 insertions(+), 80 deletions(-)

(limited to 'src/plugins/coreplugin/dialogs')

diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
index 4911429769..433af38cb0 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -38,11 +38,11 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/variablechooser.h>
 
-#include <QtCore/QTextStream>
-#include <QtCore/QFile>
-#include <QtCore/QMimeData>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMenu>
+#include <QTextStream>
+#include <QFile>
+#include <QMimeData>
+#include <QMessageBox>
+#include <QMenu>
 
 using namespace Core;
 using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h
index 35f045c60e..00afbd63f2 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h
@@ -35,8 +35,8 @@
 
 #include "coreplugin/externaltool.h"
 
-#include <QtGui/QWidget>
-#include <QtCore/QAbstractItemModel>
+#include <QWidget>
+#include <QAbstractItemModel>
 
 namespace Core {
 namespace Internal {
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index e95271313b..0bf1d8a9b2 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -35,7 +35,7 @@
 
 #include <coreplugin/core_global.h>
 
-#include <QtCore/QObject>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QIcon;
diff --git a/src/plugins/coreplugin/dialogs/iwizard.cpp b/src/plugins/coreplugin/dialogs/iwizard.cpp
index b246353731..3b16d7f59b 100644
--- a/src/plugins/coreplugin/dialogs/iwizard.cpp
+++ b/src/plugins/coreplugin/dialogs/iwizard.cpp
@@ -35,7 +35,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 /*!
     \class Core::IWizard
diff --git a/src/plugins/coreplugin/dialogs/iwizard.h b/src/plugins/coreplugin/dialogs/iwizard.h
index ec26f69650..50383da148 100644
--- a/src/plugins/coreplugin/dialogs/iwizard.h
+++ b/src/plugins/coreplugin/dialogs/iwizard.h
@@ -36,7 +36,7 @@
 #include <coreplugin/core_global.h>
 #include <coreplugin/featureprovider.h>
 
-#include <QtCore/QObject>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QIcon;
diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp
index 201c529c9e..1b5fe98fd3 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -39,15 +39,15 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/featureprovider.h>
 
-#include <QtGui/QAbstractProxyModel>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
-#include <QtGui/QStandardItem>
-#include <QtGui/QItemDelegate>
-#include <QtGui/QPainter>
-#include <QtCore/QDebug>
+#include <QAbstractProxyModel>
+#include <QSortFilterProxyModel>
+#include <QItemSelectionModel>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QStandardItem>
+#include <QItemDelegate>
+#include <QPainter>
+#include <QDebug>
 
 Q_DECLARE_METATYPE(Core::IWizard*)
 
diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h
index ff6b9d529c..623502c08e 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.h
+++ b/src/plugins/coreplugin/dialogs/newdialog.h
@@ -35,10 +35,10 @@
 
 #include "iwizard.h"
 
-#include <QtGui/QDialog>
-#include <QtGui/QIcon>
-#include <QtCore/QList>
-#include <QtCore/QModelIndex>
+#include <QDialog>
+#include <QIcon>
+#include <QList>
+#include <QModelIndex>
 
 QT_BEGIN_NAMESPACE
 class QAbstractProxyModel;
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
index 782005e254..298b565594 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
@@ -32,9 +32,9 @@
 
 #include "openwithdialog.h"
 
-#include <QtGui/QListWidget>
-#include <QtGui/QPushButton>
-#include <QtCore/QFileInfo>
+#include <QListWidget>
+#include <QPushButton>
+#include <QFileInfo>
 
 using namespace Core;
 using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.h b/src/plugins/coreplugin/dialogs/openwithdialog.h
index 9364f10aa0..08494078a9 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.h
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.h
@@ -33,7 +33,7 @@
 #ifndef OPENWITHDIALOG_H
 #define OPENWITHDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 #include "ui_openwithdialog.h"
 
 namespace Core {
diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
index e09b70a498..8962500bf2 100644
--- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
+++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
@@ -34,14 +34,14 @@
 
 #include <utils/stringutils.h>
 
-#include <QtGui/QTreeView>
-#include <QtGui/QLabel>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QStandardItem>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QVBoxLayout>
-
-#include <QtCore/QDir>
+#include <QTreeView>
+#include <QLabel>
+#include <QStandardItemModel>
+#include <QStandardItem>
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
+
+#include <QDir>
 
 enum { FileNameRole = Qt::UserRole + 1 };
 
diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h
index 433042a44d..0c742030c3 100644
--- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h
+++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h
@@ -33,7 +33,7 @@
 #ifndef PROMPTOVERWRITEDIALOG_H
 #define PROMPTOVERWRITEDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 QT_BEGIN_NAMESPACE
 class QTreeView;
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index a6836a0f08..2eb3dda40d 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -36,12 +36,12 @@
 
 #include <coreplugin/ifile.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtGui/QPushButton>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QHeaderView>
-#include <QtGui/QCheckBox>
+#include <QDir>
+#include <QFileInfo>
+#include <QPushButton>
+#include <QTreeWidget>
+#include <QHeaderView>
+#include <QCheckBox>
 
 Q_DECLARE_METATYPE(Core::IFile*)
 
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.h b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
index dd96bb443d..384306f034 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
@@ -33,8 +33,8 @@
 #ifndef SAVEITEMSDIALOG_H
 #define SAVEITEMSDIALOG_H
 
-#include <QtCore/QList>
-#include <QtGui/QDialog>
+#include <QList>
+#include <QDialog>
 
 #include "ui_saveitemsdialog.h"
 
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index a707de4515..ac0b594831 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -37,27 +37,27 @@
 
 #include <utils/filterlineedit.h>
 
-#include <QtCore/QSettings>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QIcon>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QToolButton>
-#include <QtGui/QToolBar>
-#include <QtGui/QScrollBar>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QStyle>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QFrame>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QListView>
-#include <QtGui/QApplication>
-#include <QtGui/QGroupBox>
-#include <QtGui/QStyledItemDelegate>
+#include <QSettings>
+#include <QSortFilterProxyModel>
+#include <QItemSelectionModel>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLabel>
+#include <QPushButton>
+#include <QToolButton>
+#include <QToolBar>
+#include <QScrollBar>
+#include <QSpacerItem>
+#include <QStyle>
+#include <QStackedLayout>
+#include <QGridLayout>
+#include <QLineEdit>
+#include <QFrame>
+#include <QDialogButtonBox>
+#include <QListView>
+#include <QApplication>
+#include <QGroupBox>
+#include <QStyledItemDelegate>
 
 static const char categoryKeyC[] = "General/LastPreferenceCategory";
 static const char pageKeyC[] = "General/LastPreferencePage";
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h
index 6a79a21af1..b70b86dd88 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.h
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.h
@@ -35,11 +35,11 @@
 
 #include "coreplugin/dialogs/ioptionspage.h"
 
-#include <QtCore/QList>
-#include <QtCore/QSet>
-#include <QtCore/QPointer>
-#include <QtCore/QEventLoop>
-#include <QtGui/QDialog>
+#include <QList>
+#include <QSet>
+#include <QPointer>
+#include <QEventLoop>
+#include <QDialog>
 
 QT_BEGIN_NAMESPACE
 class QModelIndex;
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 75d38d4246..dd3f45c6fb 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -42,15 +42,15 @@
 
 #include <utils/treewidgetcolumnstretcher.h>
 
-#include <QtGui/QKeyEvent>
-#include <QtGui/QShortcut>
-#include <QtGui/QHeaderView>
-#include <QtGui/QFileDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QAction>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QTreeWidgetItem>
-#include <QtCore/QCoreApplication>
+#include <QKeyEvent>
+#include <QShortcut>
+#include <QHeaderView>
+#include <QFileDialog>
+#include <QLineEdit>
+#include <QAction>
+#include <QKeyEvent>
+#include <QTreeWidgetItem>
+#include <QCoreApplication>
 #include <QtDebug>
 
 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h
index 81f6293d42..38412f6c08 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.h
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h
@@ -35,7 +35,7 @@
 
 #include <coreplugin/actionmanager/commandmappings.h>
 
-#include <QtGui/QKeySequence>
+#include <QKeySequence>
 
 QT_BEGIN_NAMESPACE
 class QKeyEvent;
-- 
cgit v1.2.1