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>
---
 src/plugins/macros/actionmacrohandler.cpp     | 16 ++++++++--------
 src/plugins/macros/actionmacrohandler.h       |  2 +-
 src/plugins/macros/imacrohandler.h            |  2 +-
 src/plugins/macros/macro.cpp                  |  4 ++--
 src/plugins/macros/macro.h                    |  4 ++--
 src/plugins/macros/macroevent.cpp             |  6 +++---
 src/plugins/macros/macroevent.h               |  2 +-
 src/plugins/macros/macrolocatorfilter.cpp     |  2 +-
 src/plugins/macros/macrolocatorfilter.h       |  2 +-
 src/plugins/macros/macromanager.cpp           | 24 ++++++++++++------------
 src/plugins/macros/macromanager.h             |  4 ++--
 src/plugins/macros/macrooptionspage.cpp       |  6 +++---
 src/plugins/macros/macrooptionswidget.cpp     | 24 ++++++++++++------------
 src/plugins/macros/macrooptionswidget.h       |  6 +++---
 src/plugins/macros/macros_global.h            |  2 +-
 src/plugins/macros/macrosplugin.cpp           | 10 +++++-----
 src/plugins/macros/macrotextfind.h            |  2 +-
 src/plugins/macros/savedialog.cpp             |  6 +++---
 src/plugins/macros/savedialog.h               |  2 +-
 src/plugins/macros/texteditormacrohandler.cpp |  8 ++++----
 20 files changed, 67 insertions(+), 67 deletions(-)

(limited to 'src/plugins/macros')

diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp
index 3a009adbf1..61f39fd9b0 100644
--- a/src/plugins/macros/actionmacrohandler.cpp
+++ b/src/plugins/macros/actionmacrohandler.cpp
@@ -43,14 +43,14 @@
 #include <coreplugin/id.h>
 #include <coreplugin/icontext.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QEvent>
-#include <QtCore/QSignalMapper>
-#include <QtCore/QtAlgorithms>
-#include <QtCore/QStringList>
-
-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
+#include <QObject>
+#include <QEvent>
+#include <QSignalMapper>
+#include <QtAlgorithms>
+#include <QStringList>
+
+#include <QAction>
+#include <QShortcut>
 
 using namespace Macros;
 using namespace Macros::Internal;
diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h
index f986c24a62..37105cd1ae 100644
--- a/src/plugins/macros/actionmacrohandler.h
+++ b/src/plugins/macros/actionmacrohandler.h
@@ -35,7 +35,7 @@
 
 #include "imacrohandler.h"
 
-#include <QtCore/QSet>
+#include <QSet>
 
 QT_BEGIN_NAMESPACE
 class QAction;
diff --git a/src/plugins/macros/imacrohandler.h b/src/plugins/macros/imacrohandler.h
index a691eb5731..bf96475cce 100644
--- a/src/plugins/macros/imacrohandler.h
+++ b/src/plugins/macros/imacrohandler.h
@@ -34,7 +34,7 @@
 #define MACROSPLUGIN_IMACROHANDLER_H
 
 #include "macros_global.h"
-#include <QtCore/QObject>
+#include <QObject>
 
 namespace Macros {
 
diff --git a/src/plugins/macros/macro.cpp b/src/plugins/macros/macro.cpp
index 2149834dfb..bf11ec84da 100644
--- a/src/plugins/macros/macro.cpp
+++ b/src/plugins/macros/macro.cpp
@@ -36,8 +36,8 @@
 #include <app/app_version.h>
 #include <utils/fileutils.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QDataStream>
+#include <QFileInfo>
+#include <QDataStream>
 
 using namespace Macros;
 
diff --git a/src/plugins/macros/macro.h b/src/plugins/macros/macro.h
index 9594ac4c98..4845d20662 100644
--- a/src/plugins/macros/macro.h
+++ b/src/plugins/macros/macro.h
@@ -35,8 +35,8 @@
 
 #include "macros_global.h"
 
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>
 
 QT_BEGIN_NAMESPACE
 class QWidget;
diff --git a/src/plugins/macros/macroevent.cpp b/src/plugins/macros/macroevent.cpp
index 8d46cb202d..e0d313bc6a 100644
--- a/src/plugins/macros/macroevent.cpp
+++ b/src/plugins/macros/macroevent.cpp
@@ -32,9 +32,9 @@
 
 #include "macroevent.h"
 
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QDataStream>
+#include <QString>
+#include <QVariant>
+#include <QDataStream>
 
 using namespace Macros;
 
diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h
index aa9c2dee75..0fef938004 100644
--- a/src/plugins/macros/macroevent.h
+++ b/src/plugins/macros/macroevent.h
@@ -35,7 +35,7 @@
 
 #include "macros_global.h"
 
-#include <QtCore/QMap>
+#include <QMap>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;
diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp
index 43613cd528..a29933bd32 100644
--- a/src/plugins/macros/macrolocatorfilter.cpp
+++ b/src/plugins/macros/macrolocatorfilter.cpp
@@ -38,7 +38,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <QtGui/QPixmap>
+#include <QPixmap>
 
 using namespace Macros;
 using namespace Macros::Internal;
diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h
index e4182ca030..875bf44faf 100644
--- a/src/plugins/macros/macrolocatorfilter.h
+++ b/src/plugins/macros/macrolocatorfilter.h
@@ -35,7 +35,7 @@
 
 #include <locator/ilocatorfilter.h>
 
-#include <QtGui/QIcon>
+#include <QIcon>
 
 namespace Macros {
 
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 0951f08599..7c1293c488 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -53,18 +53,18 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtCore/QSignalMapper>
-#include <QtCore/QList>
-
-#include <QtGui/QShortcut>
-#include <QtGui/QMainWindow>
-#include <QtGui/QAction>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QSettings>
+#include <QSignalMapper>
+#include <QList>
+
+#include <QShortcut>
+#include <QMainWindow>
+#include <QAction>
+#include <QFileDialog>
+#include <QMessageBox>
 
 using namespace Macros;
 using namespace Macros::Internal;
diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h
index 133d67cb02..c3b48ae3b1 100644
--- a/src/plugins/macros/macromanager.h
+++ b/src/plugins/macros/macromanager.h
@@ -35,8 +35,8 @@
 
 #include "macros_global.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QMap>
+#include <QObject>
+#include <QMap>
 
 QT_BEGIN_NAMESPACE
 class QAction;
diff --git a/src/plugins/macros/macrooptionspage.cpp b/src/plugins/macros/macrooptionspage.cpp
index a94e436528..ed3ccaff0d 100644
--- a/src/plugins/macros/macrooptionspage.cpp
+++ b/src/plugins/macros/macrooptionspage.cpp
@@ -38,9 +38,9 @@
 
 #include <texteditor/texteditorconstants.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtGui/QWidget>
-#include <QtGui/QIcon>
+#include <QCoreApplication>
+#include <QWidget>
+#include <QIcon>
 
 using namespace Macros;
 using namespace Macros::Internal;
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index 7154071b90..8fb6d3e286 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -43,18 +43,18 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/id.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-
-#include <QtGui/QShortcut>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QTreeWidgetItem>
-#include <QtGui/QCheckBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QRegExpValidator>
-#include <QtGui/QLineEdit>
+#include <QDir>
+#include <QFileInfo>
+
+#include <QShortcut>
+#include <QButtonGroup>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QRegExpValidator>
+#include <QLineEdit>
 
 namespace {
     int NAME_ROLE = Qt::UserRole;
diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h
index 090b06a717..18d3c8d040 100644
--- a/src/plugins/macros/macrooptionswidget.h
+++ b/src/plugins/macros/macrooptionswidget.h
@@ -33,10 +33,10 @@
 #ifndef MACROSPLUGIN_MACROOPTIONSWIDGET_H
 #define MACROSPLUGIN_MACROOPTIONSWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
+#include <QStringList>
+#include <QMap>
 
 QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;
diff --git a/src/plugins/macros/macros_global.h b/src/plugins/macros/macros_global.h
index 8a23cdff65..466569df7f 100644
--- a/src/plugins/macros/macros_global.h
+++ b/src/plugins/macros/macros_global.h
@@ -33,7 +33,7 @@
 #ifndef MACROSPLUGIN_MACROS_GLOBAL_H
 #define MACROSPLUGIN_MACROS_GLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 #if defined(MACROS_LIBRARY)
 #  define MACROS_EXPORT Q_DECL_EXPORT
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index b8dcfd850a..3fd60310eb 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -47,11 +47,11 @@
 #include <coreplugin/id.h>
 #include <coreplugin/icontext.h>
 
-#include <QtCore/QtPlugin>
-#include <QtCore/QSettings>
-#include <QtGui/QAction>
-#include <QtGui/QKeySequence>
-#include <QtGui/QMenu>
+#include <QtPlugin>
+#include <QSettings>
+#include <QAction>
+#include <QKeySequence>
+#include <QMenu>
 
 using namespace Macros;
 using namespace Macros::Internal;
diff --git a/src/plugins/macros/macrotextfind.h b/src/plugins/macros/macrotextfind.h
index cac39a421c..cdcc2c0e79 100644
--- a/src/plugins/macros/macrotextfind.h
+++ b/src/plugins/macros/macrotextfind.h
@@ -35,7 +35,7 @@
 
 #include <find/ifindsupport.h>
 
-#include <QtCore/QPointer>
+#include <QPointer>
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/savedialog.cpp b/src/plugins/macros/savedialog.cpp
index 8a75ec0618..1bc8459650 100644
--- a/src/plugins/macros/savedialog.cpp
+++ b/src/plugins/macros/savedialog.cpp
@@ -33,9 +33,9 @@
 #include "savedialog.h"
 #include "ui_savedialog.h"
 
-#include <QtGui/QLineEdit>
-#include <QtGui/QCheckBox>
-#include <QtGui/QRegExpValidator>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QRegExpValidator>
 
 using namespace Macros::Internal;
 
diff --git a/src/plugins/macros/savedialog.h b/src/plugins/macros/savedialog.h
index af49298061..4e0800ab5d 100644
--- a/src/plugins/macros/savedialog.h
+++ b/src/plugins/macros/savedialog.h
@@ -33,7 +33,7 @@
 #ifndef MACROSPLUGIN_SAVEDIALOG_H
 #define MACROSPLUGIN_SAVEDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp
index 11d58f3e80..74327b090e 100644
--- a/src/plugins/macros/texteditormacrohandler.cpp
+++ b/src/plugins/macros/texteditormacrohandler.cpp
@@ -44,10 +44,10 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/id.h>
 
-#include <QtGui/QWidget>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QApplication>
-#include <QtGui/QShortcut>
+#include <QWidget>
+#include <QKeyEvent>
+#include <QApplication>
+#include <QShortcut>
 
 using namespace Macros;
 using namespace Macros::Internal;
-- 
cgit v1.2.1