1 files changed, 10 insertions, 12 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index d66dbbba0c..53d5ae95af 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -68,11 +68,14 @@ namespace QV4 {
 
 struct Q_QML_EXPORT QmlValueTypeWrapper : Object
 {
-    V4_OBJECT
-protected:
     enum ObjectType { Reference, Copy };
-    QmlValueTypeWrapper(QV8Engine *engine, ObjectType type);
-    ~QmlValueTypeWrapper();
+    struct Data : Object::Data {
+        Data(QV8Engine *engine, ObjectType type);
+        QV8Engine *v8;
+        ObjectType objectType;
+        mutable QQmlValueType *type;
+    };
+    V4_OBJECT(Object)
 
 public:
 
@@ -82,19 +85,14 @@ 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 ReturnedValue get(Managed *m, String *name, bool *hasProperty);
+    static void put(Managed *m, String *name, const ValueRef value);
     static void destroy(Managed *that);
     static bool isEqualTo(Managed *m, Managed *other);
-    static PropertyAttributes query(const Managed *, StringRef name);
+    static PropertyAttributes query(const Managed *, String *name);
 
     static QV4::ReturnedValue method_toString(CallContext *ctx);
 
-    QV8Engine *v8;
-    ObjectType objectType;
-    mutable QQmlValueType *type;
-
     static void initProto(ExecutionEngine *v4);
 };