From fe97a5a9d0f903cbba87865b598ec321996ab7df Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Mon, 8 Oct 2012 12:44:43 +0200
Subject: [PATCH] QmlDesigner: include cleanup
Removing declarative includes.
Change-Id: Iac398fe881506cb3be07513562e864c5931d349e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
---
src/plugins/qmldesigner/designercore/include/model.h | 1 -
src/plugins/qmldesigner/designercore/include/rewriterview.h | 1 +
.../qmldesigner/designercore/instances/nodeinstanceview.cpp | 3 ---
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 3 ---
.../qmldesigner/designercore/model/abstractproperty.cpp | 1 -
src/plugins/qmldesigner/designercore/model/modelmerger.cpp | 1 +
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp | 1 -
src/plugins/qmldesigner/designercore/model/viewlogger.cpp | 1 +
8 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index 89ab059ad0c..9ea7c6f9f57 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -34,7 +34,6 @@
#include <QObject>
#include <QMimeData>
#include <QPair>
-#include <QDeclarativeError>
#include <import.h>
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index 7e80eba7456..f8c2b7e70ba 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -39,6 +39,7 @@
#include <QPointer>
#include <QWeakPointer>
#include <QHash>
+#include <QUrl>
#include <modelnode.h>
#include <QScopedPointer>
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 87e5ac80e03..af2dff0db0b 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -29,9 +29,6 @@
#include "nodeinstanceview.h"
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-
#include <QUrl>
#include <QGraphicsView>
#include <QGraphicsScene>
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index f5722f1ce30..e71f7781f9d 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -40,9 +40,6 @@
#include <QSharedData>
#include <QDebug>
#include <QIcon>
-#include <QDeclarativeContext>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
#include <qmljs/qmljsdocument.h>
#include <qmljs/qmljscontext.h>
diff --git a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp
index a2bc0acadae..4b9cb25b9fd 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp
@@ -42,7 +42,6 @@
#include "nodelistproperty.h"
#include <QTextStream>
#include <qmlobjectnode.h>
-#include <QDeclarativeView>
namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
index c3589223ad9..14c257c2646 100644
--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
@@ -42,6 +42,7 @@
#include <QSet>
#include <QStringList>
+#include <QUrl>
#include <QDebug>
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index f9c27fc897b..bdfb27c2bb7 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -29,7 +29,6 @@
#include "qmlitemnode.h"
#include <metainfo.h>
-#include <QDeclarativeView>
#include "qmlchangeset.h"
#include "variantproperty.h"
#include "nodeproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp
index 19d6f3ea4f1..e225b5aae08 100644
--- a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp
@@ -31,6 +31,7 @@
#include <QDebug>
#include <QTemporaryFile>
#include <QDir>
+#include <QUrl>
#include <variantproperty.h>
#include <bindingproperty.h>
#include <nodeabstractproperty.h>
--
GitLab