Convert Boolean and NumberObject to the new Data scheme

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

1 files changed, 18 insertions, 16 deletions

diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 775b15f09b..884409f03e 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -316,50 +316,52 @@ private:
 };
 
 struct BooleanObject: Object {
-    V4_OBJECT
-    Q_MANAGED_TYPE(BooleanObject)
-
-    struct Data {
+    struct Data : Object::Data {
         Value value;
     };
-    Data data;
+    struct {
+        Value value;
+    } __data;
+    V4_OBJECT_NEW
+    Q_MANAGED_TYPE(BooleanObject)
 
-    Value value() const { return data.value; }
+    Value value() const { return d()->value; }
 
     BooleanObject(ExecutionEngine *engine, const ValueRef val)
         : Object(engine->booleanClass)
     {
-        data.value = val;
+        d()->value = val;
     }
 protected:
     BooleanObject(InternalClass *ic)
         : Object(ic)
     {
         Q_ASSERT(internalClass()->vtable == staticVTable());
-        data.value = Encode(false);
+        d()->value = Encode(false);
     }
 };
 
 struct NumberObject: Object {
-    V4_OBJECT
-    Q_MANAGED_TYPE(NumberObject)
-
-    struct Data {
+    struct Data : Object::Data {
         Value value;
     };
-    Data data;
+    struct {
+        Value value;
+    } __data;
+    V4_OBJECT_NEW
+    Q_MANAGED_TYPE(NumberObject)
 
-    Value value() const { return data.value; }
+    Value value() const { return d()->value; }
 
     NumberObject(ExecutionEngine *engine, const ValueRef val)
         : Object(engine->numberClass) {
-        data.value = val;
+        d()->value = val;
     }
 protected:
     NumberObject(InternalClass *ic)
         : Object(ic) {
         Q_ASSERT(internalClass()->vtable == staticVTable());
-        data.value = Encode((int)0);
+        d()->value = Encode((int)0);
     }
 };