Move more Data objects into the Heap namespace

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

1 files changed, 18 insertions, 13 deletions

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);