From 4838cc89f000a2f1db4da6401fc79a75a7b86ad7 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Fri, 7 Nov 2014 01:34:29 +0100
Subject: Move data of some Qml related objects into Heap namespace.

Change-Id: I6e6b24466de1e49efd5f3eaa67db82873170445b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/qml/qqmlvaluetypewrapper_p.h | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/qml/qml/qqmlvaluetypewrapper_p.h')

diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index 8e4e3a2f7f..36ab038884 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -58,16 +58,21 @@ class QV8Engine;
 
 namespace QV4 {
 
+namespace Heap {
+
+struct QmlValueTypeWrapper : Object {
+    enum ObjectType { Reference, Copy };
+    QmlValueTypeWrapper(QV8Engine *engine, ObjectType type);
+    QV8Engine *v8;
+    ObjectType objectType;
+    mutable QQmlValueType *type;
+};
+
+}
+
 struct Q_QML_EXPORT QmlValueTypeWrapper : Object
 {
-    enum ObjectType { Reference, Copy };
-    struct Data : Heap::Object {
-        Data(QV8Engine *engine, ObjectType type);
-        QV8Engine *v8;
-        ObjectType objectType;
-        mutable QQmlValueType *type;
-    };
-    V4_OBJECT(Object)
+    V4_OBJECT2(QmlValueTypeWrapper, Object)
 
 public:
 
-- 
cgit v1.2.3