Exported header cleanup.

16 files changed, 68 insertions, 71 deletions

diff --git a/src/libs/qmleditorwidgets/colorbox.h b/src/libs/qmleditorwidgets/colorbox.h
index 53927dcac2..b3600455ca 100644
--- a/src/libs/qmleditorwidgets/colorbox.h
+++ b/src/libs/qmleditorwidgets/colorbox.h
@@ -36,8 +36,7 @@
 
 #include <qmleditorwidgets_global.h>
 #include <QtGui/QWidget>
-#include <QToolButton>
-#include <qdeclarative.h>
+#include <QtDeclarative/qdeclarative.h>
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/colorbutton.h b/src/libs/qmleditorwidgets/colorbutton.h
index 51c779d4c2..a9361b7a9c 100644
--- a/src/libs/qmleditorwidgets/colorbutton.h
+++ b/src/libs/qmleditorwidgets/colorbutton.h
@@ -35,9 +35,8 @@
 #define COLORBUTTON_H
 
 #include <qmleditorwidgets_global.h>
-#include <QtGui/QWidget>
-#include <QToolButton>
-#include <qdeclarative.h>
+#include <QtGui/QToolButton>
+#include <QtDeclarative/qdeclarative.h>
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/colorwidgets.h b/src/libs/qmleditorwidgets/colorwidgets.h
index bcc3b825ce..5af6dec064 100644
--- a/src/libs/qmleditorwidgets/colorwidgets.h
+++ b/src/libs/qmleditorwidgets/colorwidgets.h
@@ -35,16 +35,6 @@
 #define COLORWIDGET_H
 
 #include <qmleditorwidgets_global.h>
-#include <QWeakPointer>
-#include <QtGui/QWidget>
-#include <QLabel>
-#include <QToolButton>
-#include <QMouseEvent>
-
-
-QT_BEGIN_NAMESPACE
-class QToolButton;
-QT_END_NAMESPACE
 
 namespace QmlEditorWidgets {
 
@@ -52,11 +42,8 @@ class QMLEDITORWIDGETS_EXPORT ColorWidgets {
 
 public:
     static void registerDeclarativeTypes();
-
-
 };
 
-
-} //QmlDesigner
+} // namespace QmlEditorWidgets
 
 #endif //COLORWIDGET_H
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
index 40c64720da..030bc2e3f1 100644
--- a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
@@ -36,8 +36,8 @@
 #include "customcolordialog.h"
 #include "ui_contextpanetext.h"
 #include <qmljs/qmljspropertyreader.h>
-#include <QTimerEvent>
-
+#include <QtCore/QTimerEvent>
+#include <QtCore/QVariant>
 namespace QmlEditorWidgets {
 
 ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) :
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h
index 827e1369e8..c31bb4171c 100644
--- a/src/libs/qmleditorwidgets/contextpanetextwidget.h
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h
@@ -35,10 +35,10 @@
 #define CONTEXTPANETEXTWIDGET_H
 
 #include <qmleditorwidgets_global.h>
-#include <QWidget>
-#include <QVariant>
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
+class QVariant;
 namespace Ui {
     class ContextPaneTextWidget;
 }
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index 1271135e0a..4754f93a1e 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -32,17 +32,19 @@
 **************************************************************************/
 
 #include "contextpanewidget.h"
-#include <QFontComboBox>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QToolButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QMouseEvent>
-#include <QGridLayout>
-#include <QToolButton>
-#include <QAction>
+#include <QtGui/QToolButton>
+#include <QtGui/QFontComboBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QSpinBox>
+#include <QtGui/QToolButton>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QGridLayout>
+#include <QtGui/QToolButton>
+#include <QtGui/QGraphicsEffect>
+#include <QtGui/QAction>
 #include "contextpanetextwidget.h"
 #include "easingcontextpane.h"
 #include "contextpanewidgetimage.h"
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h
index 41c9f4c7fd..9a42240b02 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.h
+++ b/src/libs/qmleditorwidgets/contextpanewidget.h
@@ -35,11 +35,15 @@
 #define CONTEXTPANEWIDGET_H
 
 #include <qmleditorwidgets_global.h>
-#include <QFrame>
-#include <QVariant>
-#include <QGraphicsEffect>
-#include <QWeakPointer>
-#include <QToolButton>
+#include <QtGui/QFrame>
+#include <QtCore/QWeakPointer>
+
+QT_BEGIN_NAMESPACE
+class QToolButton;
+class QVariant;
+class QGraphicsDropShadowEffect;
+class QGraphicsOpacityEffect;
+QT_END_NAMESPACE
 
 namespace QmlJS {
     class PropertyReader;
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
index ab4eb49ba7..d6e77eb7b5 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
@@ -35,16 +35,17 @@
 #include "ui_contextpanewidgetimage.h"
 #include "ui_contextpanewidgetborderimage.h"
 #include <qmljs/qmljspropertyreader.h>
-#include <QFile>
-#include <QFileInfo>
-#include <QDir>
-#include <QPixmap>
-#include <QPainter>
-#include <QGraphicsEffect>
-#include <QMouseEvent>
-#include <QScrollArea>
-#include <QSlider>
-#include <QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
+#include <QtGui/QGraphicsEffect>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QScrollArea>
+#include <QtGui/QSlider>
+#include <QtGui/QToolButton>
+#include <QtCore/QDebug>
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
index 1e46a00bd2..6045339d0f 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
@@ -35,11 +35,9 @@
 #define CONTEXTPANEWIDGETIMAGE_H
 
 #include <qmleditorwidgets_global.h>
-#include <QWidget>
-#include <QFrame>
-#include <QLabel>
-#include <qdrawutil.h>
+#include <QtGui/QLabel>
 #include <contextpanewidget.h>
+#include <qdrawutil.h>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
index f0fad5f436..a2af64f008 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
@@ -35,7 +35,7 @@
 #define CONTEXTPANEWIDGETRECTANGLE_H
 
 #include <qmleditorwidgets_global.h>
-#include <QWidget>
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h
index ecece78b17..aaecadccd0 100644
--- a/src/libs/qmleditorwidgets/customcolordialog.h
+++ b/src/libs/qmleditorwidgets/customcolordialog.h
@@ -35,8 +35,7 @@
 #define CUSTOMCOLORDIALOG_H
 
 #include <qmleditorwidgets_global.h>
-#include <QFrame>
-#include <QDialog>
+#include <QtGui/QFrame>
 
 QT_BEGIN_NAMESPACE
 class QDoubleSpinBox;
diff --git a/src/libs/qmleditorwidgets/filewidget.cpp b/src/libs/qmleditorwidgets/filewidget.cpp
index 69c342e5f9..7e6e4c1ad7 100644
--- a/src/libs/qmleditorwidgets/filewidget.cpp
+++ b/src/libs/qmleditorwidgets/filewidget.cpp
@@ -32,12 +32,17 @@
 **************************************************************************/
 
 #include "filewidget.h"
-#include <QHBoxLayout>
-#include <QFont>
-#include <QFileDialog>
-#include <QDirIterator>
-#include <QDebug>
 
+#include <QtGui/QLabel>
+#include <QtGui/QToolButton>
+#include <QtGui/QLineEdit>
+#include <QtGui/QComboBox>
+
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QFont>
+#include <QtGui/QFileDialog>
+#include <QtCore/QDirIterator>
+#include <QtCore/QDebug>
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/filewidget.h b/src/libs/qmleditorwidgets/filewidget.h
index ebb580987e..29bdd5c2aa 100644
--- a/src/libs/qmleditorwidgets/filewidget.h
+++ b/src/libs/qmleditorwidgets/filewidget.h
@@ -36,12 +36,17 @@
 #define FILEWIDGET_H
 
 #include <qmleditorwidgets_global.h>
+
 #include <QtGui/QWidget>
-#include <QLabel>
-#include <QToolButton>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QUrl>
+
+#include <QtCore/QUrl>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QToolButton;
+class QLineEdit;
+class QComboBox;
+QT_END_NAMESPACE
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.h b/src/libs/qmleditorwidgets/fontsizespinbox.h
index f1e5f26aee..2fc6278919 100644
--- a/src/libs/qmleditorwidgets/fontsizespinbox.h
+++ b/src/libs/qmleditorwidgets/fontsizespinbox.h
@@ -35,7 +35,7 @@
 #define FONTSIZESPINBOX_H
 
 #include <qmleditorwidgets_global.h>
-#include <QAbstractSpinBox>
+#include <QtGui/QAbstractSpinBox>
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/gradientline.h b/src/libs/qmleditorwidgets/gradientline.h
index 6771c72209..2154dce5ff 100644
--- a/src/libs/qmleditorwidgets/gradientline.h
+++ b/src/libs/qmleditorwidgets/gradientline.h
@@ -36,8 +36,7 @@
 
 #include <qmleditorwidgets_global.h>
 #include <QtGui/QWidget>
-#include <QToolButton>
-#include <QLinearGradient>
+#include <QtGui/QLinearGradient>
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/huecontrol.h b/src/libs/qmleditorwidgets/huecontrol.h
index 4bafaaacec..6c599deeec 100644
--- a/src/libs/qmleditorwidgets/huecontrol.h
+++ b/src/libs/qmleditorwidgets/huecontrol.h
@@ -36,8 +36,7 @@
 
 #include <qmleditorwidgets_global.h>
 #include <QtGui/QWidget>
-#include <QToolButton>
-#include <qdeclarative.h>
+#include <QtDeclarative/qdeclarative.h>
 
 namespace QmlEditorWidgets {