Header cleanup in src, specify module name.

src/plugins/macros/macro.cpp

@@ -32,6 +32,7 @@
 **************************************************************************/
 
 #include "macro.h"
+#include "macroevent.h"
 
 #include <coreplugin/coreconstants.h>
 

src/plugins/macros/macro.h

@@ -34,21 +34,15 @@
 #ifndef MACROSPLUGIN_MACRO_H
 #define MACROSPLUGIN_MACRO_H
 
-#include <coreplugin/uniqueidmanager.h>
-
-#include <QList>
-#include <QString>
-#include <QShortcut>
-
-#include "macroevent.h"
 #include "macros_global.h"
-#include "macroevent.h"
 
 #include <QtCore/QList>
 #include <QtCore/QString>
 
 namespace Macros {
 
+class MacroEvent;
+
 class MACROS_EXPORT Macro
 {
 public:
@@ -57,7 +51,7 @@ public:
     ~Macro();
     Macro& operator=(const Macro& other);
 
-    void load(QString fileName = QString::null);
+    void load(QString fileName = QString());
     void loadHeader(const QString &fileName);
     void save(const QString &fileName);
 

src/plugins/macros/macromanager.cpp

@@ -34,6 +34,7 @@
 #include "macromanager.h"
 
 #include "macrosconstants.h"
+#include "macroevent.h"
 #include "macro.h"
 #include "macrosettings.h"
 #include "imacrohandler.h"

src/plugins/macros/macrooptionswidget.cpp

@@ -47,6 +47,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 
+#include <QtGui/QShortcut>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QTreeWidget>
 #include <QtGui/QTreeWidgetItem>

src/plugins/macros/macrosettings.h

@@ -34,7 +34,6 @@
 #ifndef MACROSPLUGIN_MACROSETTINGS_H
 #define MACROSPLUGIN_MACROSETTINGS_H
 
-#include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QMap>
 #include <QtCore/QVariant>

src/plugins/macros/texteditormacrohandler.cpp

@@ -45,10 +45,10 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/uniqueidmanager.h>
 
-#include <QWidget>
-#include <QKeyEvent>
-#include <QApplication>
-#include <QShortcut>
+#include <QtGui/QWidget>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QShortcut>
 
 using namespace Macros;
 using namespace Macros::Internal;