Move data for objects in QtQuick into the Heap namespace

Change-Id: Ic9d5946a8e60d235b8442b964dd1478363626441
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 23 insertions, 12 deletions

diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index c1b018bda6..f1927110ac 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -94,19 +94,20 @@ public:
     QV4::PersistentValue rootItemMarker;
 };
 
-struct QQuickRootItemMarker : public QV4::Object
+namespace QV4 {
+namespace Heap {
+
+struct QQuickRootItemMarker : Object {
+    inline QQuickRootItemMarker(QV4::ExecutionEngine *engine, QQuickWindow *window);
+
+    QQuickWindow *window;
+};
+
+}
+
+struct QQuickRootItemMarker : public Object
 {
-    struct Data : QV4::Heap::Object {
-        Data(QV4::ExecutionEngine *engine, QQuickWindow *window)
-            : QV4::Heap::Object(engine)
-            , window(window)
-        {
-            setVTable(staticVTable());
-        }
-
-        QQuickWindow *window;
-    };
-    V4_OBJECT(QV4::Object)
+    V4_OBJECT2(QQuickRootItemMarker, Object)
 
     static QV4::Returned<QQuickRootItemMarker> *create(QQmlEngine *engine, QQuickWindow *window);
 
@@ -114,6 +115,16 @@ struct QQuickRootItemMarker : public QV4::Object
 
 };
 
+inline
+Heap::QQuickRootItemMarker::QQuickRootItemMarker(QV4::ExecutionEngine *engine, QQuickWindow *window)
+    : Heap::Object(engine)
+    , window(window)
+{
+    setVTable(QV4::QQuickRootItemMarker::staticVTable());
+}
+
+}
+
 QT_END_NAMESPACE
 
 #endif // QQUICKVIEW_P_H