From 8450242e4a067df5660c5626d3c0d9a4587de7d0 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 12 Mar 2010 15:10:26 +0100
Subject: [PATCH] QmlDesigner: Get rid of one private header includes

---
 .../components/propertyeditor/basicwidgets.cpp   |  1 -
 .../core/instances/dummynodeinstance.cpp         |  1 -
 .../core/instances/graphicsscenenodeinstance.cpp |  2 --
 .../core/instances/graphicsviewnodeinstance.cpp  |  1 -
 .../instances/graphicswidgetnodeinstance.cpp     |  2 --
 .../core/instances/nodeinstancesignalspy.cpp     |  1 -
 .../core/instances/nodeinstanceview.cpp          |  5 ++---
 .../core/instances/objectnodeinstance.cpp        | 12 ------------
 .../core/instances/proxywidgetnodeinstance.cpp   |  2 --
 .../core/instances/qmlstatenodeinstance.h        |  4 +++-
 .../core/instances/qmlviewnodeinstance.cpp       |  2 --
 .../core/instances/widgetnodeinstance.cpp        |  2 --
 .../qmldesigner/core/metainfo/metainfo.cpp       |  1 +
 .../qmldesigner/core/metainfo/nodemetainfo.cpp   | 16 ++++++++--------
 .../core/metainfo/propertymetainfo.cpp           |  1 +
 .../qmldesigner/core/model/propertyparser.cpp    |  8 +++++---
 16 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 0c85a9753d8..fdc17c1483e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -29,7 +29,6 @@
 
 #include "basicwidgets.h"
 #include <qlayoutobject.h>
-//#include <private/graphicswidgets_p.h>
 #include <QDeclarativeContext>
 #include <QDeclarativeEngine>
 #include <QDeclarativeComponent>
diff --git a/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp b/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp
index 566878b10dc..d2f7658743e 100644
--- a/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp
@@ -29,7 +29,6 @@
 
 #include "dummynodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
 #include <nodemetainfo.h>
 
 #include <invalidnodeinstanceexception.h>
diff --git a/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp b/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp
index 0ab1f6be664..aa5fdb38879 100644
--- a/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp
@@ -29,8 +29,6 @@
 
 #include "graphicsscenenodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include "graphicsviewnodeinstance.h"
 
 #include <invalidnodeinstanceexception.h>
diff --git a/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp
index 197992ffec9..866f0ca9d3a 100644
--- a/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp
@@ -29,7 +29,6 @@
 
 #include "graphicsviewnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
 #include <QDeclarativeEngine>
 #include <invalidnodeinstanceexception.h>
 
diff --git a/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp
index 68415bdd0c9..de5239ec0a1 100644
--- a/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp
@@ -32,8 +32,6 @@
 
 #include "objectnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include <invalidnodeinstanceexception.h>
 #include <propertymetainfo.h>
 
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp b/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
index 48a19d019c2..670a6d20651 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
@@ -4,7 +4,6 @@
 #include <QMetaProperty>
 #include <QMetaObject>
 #include <QtDebug>
-#include <private/qdeclarativeproperty_p.h>
 
 #include "objectnodeinstance.h"
 #include <QSharedPointer>
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
index 19c87b25685..2f50d777e6e 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
@@ -29,15 +29,14 @@
 
 #include "nodeinstanceview.h"
 
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeContext>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
 
 #include <QtDebug>
 #include <QUrl>
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QGraphicsObject>
-#include <private/qdeclarativeengine_p.h>
 
 #include <model.h>
 #include <modelnode.h>
diff --git a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
index 7157ef0982a..70e6f26dbf9 100644
--- a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
@@ -57,18 +57,6 @@
 #include <QSharedPointer>
 
 #include <private/qdeclarativebinding_p.h>
-#include <private/qdeclarativecontext_p.h>
-#include <private/qdeclarativelistaccessor_p.h>
-#include <private/qdeclarativevaluetype_p.h>
-#include <private/qdeclarativeanchors_p.h>
-#include <private/qdeclarativerectangle_p.h> // to get QDeclarativePen
-#include <private/qmetaobjectbuilder_p.h>
-#include <private/qdeclarativevmemetaobject_p.h>
-#include <private/qdeclarativemetatype_p.h>
-#include <private/qobject_p.h>
-#include <private/qdeclarativeproperty_p.h>
-
-
 
 namespace QmlDesigner {
 namespace Internal {
diff --git a/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
index 6b4f2df863c..d403ef89190 100644
--- a/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
@@ -29,8 +29,6 @@
 
 #include "proxywidgetnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include <QGraphicsProxyWidget>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h b/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h
index 9f7a8c5fd3a..bc3b8f7e318 100644
--- a/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h
+++ b/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h
@@ -31,7 +31,9 @@
 #define QMLSTATENODEINSTANCE_H
 
 #include "objectnodeinstance.h"
-#include <private/qdeclarativestate_p.h>
+
+class QDeclarativeState;
+class QDeclarativeStateGroup;
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp
index 72006e0c581..516c4d6542f 100644
--- a/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp
@@ -29,8 +29,6 @@
 
 #include "qmlviewnodeinstance.h"
 
-
-#include <private/qdeclarativemetatype_p.h>
 #include <QDeclarativeView>
 #include <QDeclarativeItem>
 
diff --git a/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp
index 871123574f6..ab61ee990bf 100644
--- a/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp
@@ -29,8 +29,6 @@
 
 #include "widgetnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include "proxywidgetnodeinstance.h"
 #include <invalidnodeinstanceexception.h>
 
diff --git a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
index 15829d91adc..7a1a0f5c98c 100644
--- a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
@@ -45,6 +45,7 @@
 #include <QtAlgorithms>
 #include <QMetaProperty>
 #include <QDeclarativeEngine>
+
 #include <private/qdeclarativemetatype_p.h>
 #include <private/qdeclarativeanchors_p.h>
 
diff --git a/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp
index 68c226d2a28..0e295a81029 100644
--- a/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp
@@ -36,14 +36,14 @@
 #include "metainfo.h"
 #include "propertymetainfo.h"
 
-#include <QtCore/QSharedData>
-#include <QtCore/QtDebug>
-#include <QtGui/QIcon>
-#include <QtDeclarative/private/qdeclarativemetatype_p.h>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <private/qdeclarativevaluetype_p.h>
+#include <QSharedData>
+#include <QtDebug>
+#include <QIcon>
+#include <QDeclarativeContext>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+
+#include <private/qdeclarativemetatype_p.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
index 769a3a41ecd..af4ba9dd55b 100644
--- a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
@@ -34,6 +34,7 @@
 #include "invalidmetainfoexception.h"
 #include "metainfo.h"
 #include "modelnode.h"
+
 #include <private/qdeclarativevaluetype_p.h>
 #include <private/qdeclarativestringconverters_p.h>
 
diff --git a/src/plugins/qmldesigner/core/model/propertyparser.cpp b/src/plugins/qmldesigner/core/model/propertyparser.cpp
index 50453d3ea87..91cb772786c 100644
--- a/src/plugins/qmldesigner/core/model/propertyparser.cpp
+++ b/src/plugins/qmldesigner/core/model/propertyparser.cpp
@@ -28,12 +28,14 @@
 **************************************************************************/
 
 #include "propertyparser.h"
-#include <QUrl>
-#include <QtCore/QDebug>
-#include <QtDeclarative/private/qdeclarativestringconverters_p.h>
 #include <modelnode.h>
 #include <metainfo.h>
 
+#include <QUrl>
+#include <QDebug>
+
+#include <private/qdeclarativestringconverters_p.h>
+
 namespace QmlDesigner {
 namespace Internal {
 namespace PropertyParser {
-- 
GitLab