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

@@ -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 <QObject>
+#include <QEvent>
+#include <QSignalMapper>
+#include <QtAlgorithms>
+#include <QStringList>
 
-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
+#include <QAction>
+#include <QShortcut>
 
 using namespace Macros;
 using namespace Macros::Internal;

src/plugins/macros/actionmacrohandler.h

@@ -35,7 +35,7 @@
 
 #include "imacrohandler.h"
 
-#include <QtCore/QSet>
+#include <QSet>
 
 QT_BEGIN_NAMESPACE
 class QAction;

src/plugins/macros/imacrohandler.h

@@ -34,7 +34,7 @@
 #define MACROSPLUGIN_IMACROHANDLER_H
 
 #include "macros_global.h"
-#include <QtCore/QObject>
+#include <QObject>
 
 namespace Macros {
 

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;
 

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;

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;
 

src/plugins/macros/macroevent.h

@@ -35,7 +35,7 @@
 
 #include "macros_global.h"
 
-#include <QtCore/QMap>
+#include <QMap>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;

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;

src/plugins/macros/macrolocatorfilter.h

@@ -35,7 +35,7 @@
 
 #include <locator/ilocatorfilter.h>
 
-#include <QtGui/QIcon>
+#include <QIcon>
 
 namespace Macros {
 

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 <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QSettings>
+#include <QSignalMapper>
+#include <QList>
 
-#include <QtGui/QShortcut>
-#include <QtGui/QMainWindow>
-#include <QtGui/QAction>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
+#include <QShortcut>
+#include <QMainWindow>
+#include <QAction>
+#include <QFileDialog>
+#include <QMessageBox>
 
 using namespace Macros;
 using namespace Macros::Internal;

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;

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;

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 <QDir>
+#include <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 <QShortcut>
+#include <QButtonGroup>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QRegExpValidator>
+#include <QLineEdit>
 
 namespace {
     int NAME_ROLE = Qt::UserRole;

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;

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

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;

src/plugins/macros/macrotextfind.h

@@ -35,7 +35,7 @@
 
 #include <find/ifindsupport.h>
 
-#include <QtCore/QPointer>
+#include <QPointer>
 
 namespace Macros {
 namespace Internal {

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;
 

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 {

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;