Move Data for typedarrays into Heap namespace

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

1 files changed, 15 insertions, 10 deletions

diff --git a/src/qml/jsruntime/qv4arraybuffer_p.h b/src/qml/jsruntime/qv4arraybuffer_p.h
index e1bf1d7ef0..228b40645d 100644
--- a/src/qml/jsruntime/qv4arraybuffer_p.h
+++ b/src/qml/jsruntime/qv4arraybuffer_p.h
@@ -40,13 +40,22 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
+namespace Heap {
+
+struct ArrayBufferCtor : FunctionObject {
+    ArrayBufferCtor(QV4::ExecutionContext *scope);
+};
+
+struct ArrayBuffer : Object {
+    ArrayBuffer(ExecutionEngine *e, int length);
+    QTypedArrayData<char> *data;
+};
+
+}
+
 struct ArrayBufferCtor: FunctionObject
 {
-    struct Data : Heap::FunctionObject {
-        Data(ExecutionContext *scope);
-    };
-
-    V4_OBJECT(FunctionObject)
+    V4_OBJECT2(ArrayBufferCtor, FunctionObject)
 
     static ReturnedValue construct(Managed *m, CallData *callData);
     static ReturnedValue call(Managed *that, CallData *callData);
@@ -57,11 +66,7 @@ struct ArrayBufferCtor: FunctionObject
 
 struct ArrayBuffer : Object
 {
-    struct Data : Heap::Object {
-        Data(ExecutionEngine *e, int length);
-        QTypedArrayData<char> *data;
-    };
-    V4_OBJECT(Object)
+    V4_OBJECT2(ArrayBuffer, Object)
 
     QByteArray asByteArray() const;
     uint byteLength() const { return d()->data->size; }