Exported header cleanup.

17 files changed, 73 insertions, 63 deletions

diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp
index 3f8d8c6b2a..82f1e3de16 100644
--- a/src/plugins/macros/actionmacrohandler.cpp
+++ b/src/plugins/macros/actionmacrohandler.cpp
@@ -44,18 +44,18 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/icontext.h>
 
-#include <QObject>
-#include <QEvent>
-#include <QAction>
-#include <QSignalMapper>
-#include <QShortcut>
-#include <QtAlgorithms>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QEvent>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QtAlgorithms>
+#include <QtCore/QStringList>
+
+#include <QtGui/QAction>
+#include <QtGui/QShortcut>
 
 using namespace Macros;
 using namespace Macros::Internal;
 
-
 static const char EVENTNAME[] = "Action";
 static quint8 ACTIONNAME = 0;
 
diff --git a/src/plugins/macros/imacrohandler.h b/src/plugins/macros/imacrohandler.h
index da84f68e26..409b66c235 100644
--- a/src/plugins/macros/imacrohandler.h
+++ b/src/plugins/macros/imacrohandler.h
@@ -35,7 +35,7 @@
 #define MACROSPLUGIN_IMACROHANDLER_H
 
 #include "macros_global.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Macros {
 
diff --git a/src/plugins/macros/macro.cpp b/src/plugins/macros/macro.cpp
index e21e9e4ff4..8e132df711 100644
--- a/src/plugins/macros/macro.cpp
+++ b/src/plugins/macros/macro.cpp
@@ -35,7 +35,8 @@
 
 #include <coreplugin/coreconstants.h>
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDataStream>
 
 using namespace Macros;
 
diff --git a/src/plugins/macros/macro.h b/src/plugins/macros/macro.h
index 17a951d89c..dc8fa0d9c5 100644
--- a/src/plugins/macros/macro.h
+++ b/src/plugins/macros/macro.h
@@ -34,11 +34,11 @@
 #ifndef MACROSPLUGIN_MACRO_H
 #define MACROSPLUGIN_MACRO_H
 
-#include <QList>
-#include <QString>
-
-#include "macroevent.h"
 #include "macros_global.h"
+#include "macroevent.h"
+
+#include <QtCore/QList>
+#include <QtCore/QString>
 
 namespace Macros {
 
diff --git a/src/plugins/macros/macroevent.cpp b/src/plugins/macros/macroevent.cpp
index 67a03ea5be..2ef2b93018 100644
--- a/src/plugins/macros/macroevent.cpp
+++ b/src/plugins/macros/macroevent.cpp
@@ -33,6 +33,10 @@
 
 #include "macroevent.h"
 
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+#include <QtCore/QDataStream>
+
 using namespace Macros;
 
 /*!
diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h
index a1e31dcdf7..de32570e42 100644
--- a/src/plugins/macros/macroevent.h
+++ b/src/plugins/macros/macroevent.h
@@ -36,9 +36,13 @@
 
 #include "macros_global.h"
 
-#include <QString>
-#include <QVariant>
-#include <QDataStream>
+#include <QtCore/QMap>
+
+QT_BEGIN_NAMESPACE
+class QByteArray;
+class QVariant;
+class QDataStream;
+QT_END_NAMESPACE
 
 namespace Macros {
 
diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp
index 8e914e562d..f65b5fa1d5 100644
--- a/src/plugins/macros/macrolocatorfilter.cpp
+++ b/src/plugins/macros/macrolocatorfilter.cpp
@@ -39,15 +39,15 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 using namespace Macros;
 using namespace Macros::Internal;
 
 MacroLocatorFilter::MacroLocatorFilter():
-    m_icon(QPixmap(":/macros/images/macro.png"))
+    m_icon(QPixmap(QLatin1String(":/macros/images/macro.png")))
 {
-    setShortcutString("rm");
+    setShortcutString(QLatin1String("rm"));
 }
 
 MacroLocatorFilter::~MacroLocatorFilter()
diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h
index dc95370746..561a1fc309 100644
--- a/src/plugins/macros/macrolocatorfilter.h
+++ b/src/plugins/macros/macrolocatorfilter.h
@@ -36,7 +36,7 @@
 
 #include <locator/ilocatorfilter.h>
 
-#include <QIcon>
+#include <QtGui/QIcon>
 
 namespace Macros {
 
@@ -61,7 +61,7 @@ public:
     void refresh(QFutureInterface<void> &future);
 
 private:
-    QIcon m_icon;
+    const QIcon m_icon;
 };
 
 } // namespace Internal
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 6e6c9bce15..f97ce1b063 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -54,18 +54,19 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QShortcut>
-#include <QKeySequence>
-#include <QMainWindow>
-#include <QSettings>
-#include <QAction>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QSignalMapper>
-#include <QList>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSettings>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QList>
+
+#include <QtGui/QShortcut>
+#include <QtGui/QKeySequence>
+#include <QtGui/QMainWindow>
+#include <QtGui/QAction>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
 
 using namespace Macros;
 using namespace Macros::Internal;
diff --git a/src/plugins/macros/macrooptionspage.cpp b/src/plugins/macros/macrooptionspage.cpp
index 6dde17ea0d..52a3007084 100644
--- a/src/plugins/macros/macrooptionspage.cpp
+++ b/src/plugins/macros/macrooptionspage.cpp
@@ -39,9 +39,9 @@
 
 #include <texteditor/texteditorconstants.h>
 
-#include <QCoreApplication>
-#include <QWidget>
-#include <QIcon>
+#include <QtCore/QCoreApplication>
+#include <QtGui/QWidget>
+#include <QtGui/QIcon>
 
 using namespace Macros;
 using namespace Macros::Internal;
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index 665f5cd780..703c82d8c1 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -44,16 +44,17 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/uniqueidmanager.h>
 
-#include <QButtonGroup>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QCheckBox>
-#include <QDir>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QFileInfo>
-#include <QRegExpValidator>
-#include <QLineEdit>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+
+#include <QtGui/QButtonGroup>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QTreeWidgetItem>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QRegExpValidator>
+#include <QtGui/QLineEdit>
 
 namespace {
     int DIRECTORY = 1;
diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h
index 16e17f4383..c3d84d5c37 100644
--- a/src/plugins/macros/macrooptionswidget.h
+++ b/src/plugins/macros/macrooptionswidget.h
@@ -34,10 +34,10 @@
 #ifndef MACROSPLUGIN_MACROOPTIONSWIDGET_H
 #define MACROSPLUGIN_MACROOPTIONSWIDGET_H
 
-#include <QWidget>
-#include <QPixmap>
-#include <QMap>
-#include <QStringList>
+#include <QtGui/QWidget>
+
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
 
 QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;
diff --git a/src/plugins/macros/macrosettings.cpp b/src/plugins/macros/macrosettings.cpp
index f27b219172..a3185b3ea8 100644
--- a/src/plugins/macros/macrosettings.cpp
+++ b/src/plugins/macros/macrosettings.cpp
@@ -33,7 +33,7 @@
 
 #include "macrosettings.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 using namespace Macros::Internal;
 
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index 351b7d22d5..61f849c067 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -48,16 +48,15 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/icontext.h>
 
-#include <QtPlugin>
-#include <QAction>
-#include <QKeySequence>
-#include <QSettings>
-#include <QMenu>
+#include <QtCore/QtPlugin>
+#include <QtCore/QSettings>
+#include <QtGui/QAction>
+#include <QtGui/QKeySequence>
+#include <QtGui/QMenu>
 
 using namespace Macros;
 using namespace Macros::Internal;
 
-
 MacrosPlugin::MacrosPlugin()
 {
 }
diff --git a/src/plugins/macros/macrotextfind.h b/src/plugins/macros/macrotextfind.h
index 0a935ef3b6..3fc63aa8b7 100644
--- a/src/plugins/macros/macrotextfind.h
+++ b/src/plugins/macros/macrotextfind.h
@@ -36,7 +36,7 @@
 
 #include <find/ifindsupport.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/savedialog.cpp b/src/plugins/macros/savedialog.cpp
index 2021925d81..ef42e88b65 100644
--- a/src/plugins/macros/savedialog.cpp
+++ b/src/plugins/macros/savedialog.cpp
@@ -34,9 +34,9 @@
 #include "savedialog.h"
 #include "ui_savedialog.h"
 
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QRegExpValidator>
+#include <QtGui/QLineEdit>
+#include <QtGui/QCheckBox>
+#include <QtGui/QRegExpValidator>
 
 using namespace Macros::Internal;
 
diff --git a/src/plugins/macros/savedialog.h b/src/plugins/macros/savedialog.h
index cd44d76a27..d1d1e0c408 100644
--- a/src/plugins/macros/savedialog.h
+++ b/src/plugins/macros/savedialog.h
@@ -34,7 +34,7 @@
 #ifndef MACROSPLUGIN_SAVEDIALOG_H
 #define MACROSPLUGIN_SAVEDIALOG_H
 
-#include <QDialog>
+#include <QtGui/QDialog>
 
 namespace Macros {
 namespace Internal {