Convert QQmlValueTypeWrapper to the new storage scheme

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

1 files changed, 13 insertions, 7 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index d66dbbba0c..a7ed8e6ef1 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -68,9 +68,20 @@ namespace QV4 {
 
 struct Q_QML_EXPORT QmlValueTypeWrapper : Object
 {
-    V4_OBJECT
-protected:
     enum ObjectType { Reference, Copy };
+    struct Data : Object::Data {
+        QV8Engine *v8;
+        ObjectType objectType;
+        mutable QQmlValueType *type;
+    };
+    struct {
+        QV8Engine *v8;
+        ObjectType objectType;
+        mutable QQmlValueType *type;
+    } __data;
+
+    V4_OBJECT_NEW
+protected:
     QmlValueTypeWrapper(QV8Engine *engine, ObjectType type);
     ~QmlValueTypeWrapper();
 
@@ -82,7 +93,6 @@ public:
     QVariant toVariant() const;
     bool isEqual(const QVariant& value);
 
-
     static ReturnedValue get(Managed *m, const StringRef name, bool *hasProperty);
     static void put(Managed *m, const StringRef name, const ValueRef value);
     static void destroy(Managed *that);
@@ -91,10 +101,6 @@ public:
 
     static QV4::ReturnedValue method_toString(CallContext *ctx);
 
-    QV8Engine *v8;
-    ObjectType objectType;
-    mutable QQmlValueType *type;
-
     static void initProto(ExecutionEngine *v4);
 };