Move more Data objects into the Heap namespace

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

8 files changed, 75 insertions, 56 deletions

diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index 2c19d8e0a1..4d8f96cac3 100644
--- a/src/qml/jsruntime/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
@@ -877,14 +877,14 @@ QString Stringify::JA(ArrayObject *a)
 }
 
 
-JsonObject::Data::Data(InternalClass *ic)
+Heap::JsonObject::JsonObject(InternalClass *ic)
     : Heap::Object(ic)
 {
     Scope scope(ic->engine);
     ScopedObject o(scope, this);
 
-    o->defineDefaultProperty(QStringLiteral("parse"), method_parse, 2);
-    o->defineDefaultProperty(QStringLiteral("stringify"), method_stringify, 3);
+    o->defineDefaultProperty(QStringLiteral("parse"), QV4::JsonObject::method_parse, 2);
+    o->defineDefaultProperty(QStringLiteral("stringify"), QV4::JsonObject::method_stringify, 3);
 }
 
 
diff --git a/src/qml/jsruntime/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h
index 07c8040b31..e1202095a9 100644
--- a/src/qml/jsruntime/qv4jsonobject_p.h
+++ b/src/qml/jsruntime/qv4jsonobject_p.h
@@ -42,12 +42,17 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
+namespace Heap {
+
+struct JsonObject : Object {
+    JsonObject(InternalClass *ic);
+};
+
+}
+
 struct JsonObject : Object {
-    struct Data : Heap::Object {
-        Data(InternalClass *ic);
-    };
     Q_MANAGED_TYPE(JsonObject)
-    V4_OBJECT(Object)
+    V4_OBJECT2(JsonObject, Object)
 private:
     typedef QSet<QV4::Object *> V4ObjectSet;
 public:
diff --git a/src/qml/jsruntime/qv4mathobject.cpp b/src/qml/jsruntime/qv4mathobject.cpp
index 78d24f5e92..65302cd804 100644
--- a/src/qml/jsruntime/qv4mathobject.cpp
+++ b/src/qml/jsruntime/qv4mathobject.cpp
@@ -47,7 +47,7 @@ DEFINE_OBJECT_VTABLE(MathObject);
 
 static const double qt_PI = 2.0 * ::asin(1.0);
 
-MathObject::Data::Data(InternalClass *ic)
+Heap::MathObject::MathObject(InternalClass *ic)
     : Heap::Object(ic)
 {
     Scope scope(ic->engine);
@@ -62,24 +62,24 @@ MathObject::Data::Data(InternalClass *ic)
     m->defineReadonlyProperty(QStringLiteral("SQRT1_2"), Primitive::fromDouble(::sqrt(0.5)));
     m->defineReadonlyProperty(QStringLiteral("SQRT2"), Primitive::fromDouble(::sqrt(2.0)));
 
-    m->defineDefaultProperty(QStringLiteral("abs"), method_abs, 1);
-    m->defineDefaultProperty(QStringLiteral("acos"), method_acos, 1);
-    m->defineDefaultProperty(QStringLiteral("asin"), method_asin, 0);
-    m->defineDefaultProperty(QStringLiteral("atan"), method_atan, 1);
-    m->defineDefaultProperty(QStringLiteral("atan2"), method_atan2, 2);
-    m->defineDefaultProperty(QStringLiteral("ceil"), method_ceil, 1);
-    m->defineDefaultProperty(QStringLiteral("cos"), method_cos, 1);
-    m->defineDefaultProperty(QStringLiteral("exp"), method_exp, 1);
-    m->defineDefaultProperty(QStringLiteral("floor"), method_floor, 1);
-    m->defineDefaultProperty(QStringLiteral("log"), method_log, 1);
-    m->defineDefaultProperty(QStringLiteral("max"), method_max, 2);
-    m->defineDefaultProperty(QStringLiteral("min"), method_min, 2);
-    m->defineDefaultProperty(QStringLiteral("pow"), method_pow, 2);
-    m->defineDefaultProperty(QStringLiteral("random"), method_random, 0);
-    m->defineDefaultProperty(QStringLiteral("round"), method_round, 1);
-    m->defineDefaultProperty(QStringLiteral("sin"), method_sin, 1);
-    m->defineDefaultProperty(QStringLiteral("sqrt"), method_sqrt, 1);
-    m->defineDefaultProperty(QStringLiteral("tan"), method_tan, 1);
+    m->defineDefaultProperty(QStringLiteral("abs"), QV4::MathObject::method_abs, 1);
+    m->defineDefaultProperty(QStringLiteral("acos"), QV4::MathObject::method_acos, 1);
+    m->defineDefaultProperty(QStringLiteral("asin"), QV4::MathObject::method_asin, 0);
+    m->defineDefaultProperty(QStringLiteral("atan"), QV4::MathObject::method_atan, 1);
+    m->defineDefaultProperty(QStringLiteral("atan2"), QV4::MathObject::method_atan2, 2);
+    m->defineDefaultProperty(QStringLiteral("ceil"), QV4::MathObject::method_ceil, 1);
+    m->defineDefaultProperty(QStringLiteral("cos"), QV4::MathObject::method_cos, 1);
+    m->defineDefaultProperty(QStringLiteral("exp"), QV4::MathObject::method_exp, 1);
+    m->defineDefaultProperty(QStringLiteral("floor"), QV4::MathObject::method_floor, 1);
+    m->defineDefaultProperty(QStringLiteral("log"), QV4::MathObject::method_log, 1);
+    m->defineDefaultProperty(QStringLiteral("max"), QV4::MathObject::method_max, 2);
+    m->defineDefaultProperty(QStringLiteral("min"), QV4::MathObject::method_min, 2);
+    m->defineDefaultProperty(QStringLiteral("pow"), QV4::MathObject::method_pow, 2);
+    m->defineDefaultProperty(QStringLiteral("random"), QV4::MathObject::method_random, 0);
+    m->defineDefaultProperty(QStringLiteral("round"), QV4::MathObject::method_round, 1);
+    m->defineDefaultProperty(QStringLiteral("sin"), QV4::MathObject::method_sin, 1);
+    m->defineDefaultProperty(QStringLiteral("sqrt"), QV4::MathObject::method_sqrt, 1);
+    m->defineDefaultProperty(QStringLiteral("tan"), QV4::MathObject::method_tan, 1);
 }
 
 /* copies the sign from y to x and returns the result */
diff --git a/src/qml/jsruntime/qv4mathobject_p.h b/src/qml/jsruntime/qv4mathobject_p.h
index 4d135c46a4..1ff5e5a081 100644
--- a/src/qml/jsruntime/qv4mathobject_p.h
+++ b/src/qml/jsruntime/qv4mathobject_p.h
@@ -39,13 +39,17 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
+namespace Heap {
+
+struct MathObject : Object {
+    MathObject(InternalClass *ic);
+};
+
+}
+
 struct MathObject: Object
 {
-    struct Data : Heap::Object {
-        Data(InternalClass *ic);
-    };
-
-    V4_OBJECT(Object)
+    V4_OBJECT2(MathObject, Object)
     Q_MANAGED_TYPE(MathObject)
 
     static ReturnedValue method_abs(CallContext *context);
diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp
index f4d0c47a1c..1cb240965d 100644
--- a/src/qml/jsruntime/qv4numberobject.cpp
+++ b/src/qml/jsruntime/qv4numberobject.cpp
@@ -45,10 +45,10 @@ using namespace QV4;
 DEFINE_OBJECT_VTABLE(NumberCtor);
 DEFINE_OBJECT_VTABLE(NumberObject);
 
-NumberCtor::Data::Data(ExecutionContext *scope)
+Heap::NumberCtor::NumberCtor(QV4::ExecutionContext *scope)
     : Heap::FunctionObject(scope, QStringLiteral("Number"))
 {
-    setVTable(staticVTable());
+    setVTable(QV4::NumberCtor::staticVTable());
 }
 
 ReturnedValue NumberCtor::construct(Managed *m, CallData *callData)
diff --git a/src/qml/jsruntime/qv4numberobject_p.h b/src/qml/jsruntime/qv4numberobject_p.h
index ad3fe328ef..01a8773b73 100644
--- a/src/qml/jsruntime/qv4numberobject_p.h
+++ b/src/qml/jsruntime/qv4numberobject_p.h
@@ -41,12 +41,17 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
+namespace Heap {
+
+struct NumberCtor : FunctionObject {
+    NumberCtor(QV4::ExecutionContext *scope);
+};
+
+}
+
 struct NumberCtor: FunctionObject
 {
-    struct Data : Heap::FunctionObject {
-        Data(ExecutionContext *scope);
-    };
-    V4_OBJECT(FunctionObject)
+    V4_OBJECT2(NumberCtor, FunctionObject)
 
     static ReturnedValue construct(Managed *that, CallData *callData);
     static ReturnedValue call(Managed *, CallData *callData);
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 0c2261dca0..95fb6e394d 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -69,10 +69,10 @@ using namespace QV4;
 
 DEFINE_OBJECT_VTABLE(StringObject);
 
-StringObject::Data::Data(InternalClass *ic)
+Heap::StringObject::StringObject(InternalClass *ic)
     : Heap::Object(ic)
 {
-    Q_ASSERT(internalClass->vtable == staticVTable());
+    Q_ASSERT(internalClass->vtable == QV4::StringObject::staticVTable());
     value = ic->engine->newString(QStringLiteral(""))->asReturnedValue();
     tmpProperty.value = Primitive::undefinedValue();
 
@@ -81,13 +81,13 @@ StringObject::Data::Data(InternalClass *ic)
     s->defineReadonlyProperty(ic->engine->id_length, Primitive::fromInt32(0));
 }
 
-StringObject::Data::Data(ExecutionEngine *engine, const ValueRef val)
+Heap::StringObject::StringObject(ExecutionEngine *engine, const ValueRef val)
     : Heap::Object(engine->stringObjectClass)
 {
     value = val;
     Q_ASSERT(value.isString());
     tmpProperty.value = Primitive::undefinedValue();
-    setVTable(staticVTable());
+    setVTable(QV4::StringObject::staticVTable());
 
     Scope scope(engine);
     ScopedObject s(scope, this);
@@ -159,10 +159,10 @@ void StringObject::markObjects(Heap::Base *that, ExecutionEngine *e)
 
 DEFINE_OBJECT_VTABLE(StringCtor);
 
-StringCtor::Data::Data(ExecutionContext *scope)
+Heap::StringCtor::StringCtor(QV4::ExecutionContext *scope)
     : Heap::FunctionObject(scope, QStringLiteral("String"))
 {
-    setVTable(staticVTable());
+    setVTable(QV4::StringCtor::staticVTable());
 }
 
 ReturnedValue StringCtor::construct(Managed *m, CallData *callData)
diff --git a/src/qml/jsruntime/qv4stringobject_p.h b/src/qml/jsruntime/qv4stringobject_p.h
index 5e5d28bf4c..b82cf08a8b 100644
--- a/src/qml/jsruntime/qv4stringobject_p.h
+++ b/src/qml/jsruntime/qv4stringobject_p.h
@@ -41,18 +41,26 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
+namespace Heap {
+
+struct StringObject : Object {
+    StringObject(ExecutionEngine *engine, const ValueRef value);
+    StringObject(InternalClass *ic);
+    Value value;
+    // ### get rid of tmpProperty
+    mutable Property tmpProperty;
+};
+
+struct StringCtor : FunctionObject {
+    StringCtor(QV4::ExecutionContext *scope);
+};
+
+}
+
 struct StringObject: Object {
-    struct Data : Heap::Object {
-        Data(ExecutionEngine *engine, const ValueRef value);
-        Data(InternalClass *ic);
-        Value value;
-        // ### get rid of tmpProperty
-        mutable Property tmpProperty;
-    };
-    V4_OBJECT(Object)
+    V4_OBJECT2(StringObject, Object)
     Q_MANAGED_TYPE(StringObject)
 
-
     Property *getIndex(uint index) const;
 
     static bool deleteIndexedProperty(Managed *m, uint index);
@@ -64,10 +72,7 @@ protected:
 
 struct StringCtor: FunctionObject
 {
-    struct Data : Heap::FunctionObject {
-        Data(ExecutionContext *scope);
-    };
-    V4_OBJECT(FunctionObject)
+    V4_OBJECT2(StringCtor, FunctionObject)
 
     static ReturnedValue construct(Managed *m, CallData *callData);
     static ReturnedValue call(Managed *that, CallData *callData);