Move Object::Data into the Heap namespace

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

13 files changed, 29 insertions, 29 deletions

diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 0ba72c1641..ddb9633427 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1072,7 +1072,7 @@ class QQmlComponentIncubator;
 
 struct QmlIncubatorObject : public QV4::Object
 {
-    struct Data : QV4::Object::Data {
+    struct Data : QV4::Heap::Object {
         Data(QV8Engine *engine, QQmlIncubator::IncubationMode = QQmlIncubator::Asynchronous);
         QScopedPointer<QQmlComponentIncubator> incubator;
         QV8Engine *v8;
@@ -1470,7 +1470,7 @@ QQmlComponentExtension::~QQmlComponentExtension()
 }
 
 QmlIncubatorObject::Data::Data(QV8Engine *engine, QQmlIncubator::IncubationMode m)
-    : Object::Data(QV8Engine::getV4(engine))
+    : QV4::Heap::Object(QV8Engine::getV4(engine))
     , v8(engine)
     , valuemap(QV4::Primitive::undefinedValue())
     , qmlGlobal(QV4::Primitive::undefinedValue())
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
index bbb757797e..c74d9ecd54 100644
--- a/src/qml/qml/qqmlcontextwrapper.cpp
+++ b/src/qml/qml/qqmlcontextwrapper.cpp
@@ -54,7 +54,7 @@ using namespace QV4;
 DEFINE_OBJECT_VTABLE(QmlContextWrapper);
 
 QmlContextWrapper::Data::Data(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext)
-    : Object::Data(QV8Engine::getV4(engine))
+    : Heap::Object(QV8Engine::getV4(engine))
     , readOnly(true)
     , ownsContext(ownsContext)
     , isNullWrapper(false)
@@ -433,7 +433,7 @@ ReturnedValue QmlContextWrapper::qmlSingletonWrapper(QV8Engine *v8, String *name
 DEFINE_OBJECT_VTABLE(QQmlIdObjectsArray);
 
 QQmlIdObjectsArray::Data::Data(ExecutionEngine *engine, QmlContextWrapper *contextWrapper)
-    : Object::Data(engine)
+    : Heap::Object(engine)
     , contextWrapper(contextWrapper)
 {
     setVTable(staticVTable());
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h
index 5f2229fe51..e3a1d9b508 100644
--- a/src/qml/qml/qqmlcontextwrapper_p.h
+++ b/src/qml/qml/qqmlcontextwrapper_p.h
@@ -65,7 +65,7 @@ struct QQmlIdObjectsArray;
 
 struct Q_QML_EXPORT QmlContextWrapper : Object
 {
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false);
         ~Data();
         bool readOnly;
@@ -104,7 +104,7 @@ struct Q_QML_EXPORT QmlContextWrapper : Object
 
 struct QQmlIdObjectsArray : public Object
 {
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(ExecutionEngine *engine, QmlContextWrapper *contextWrapper);
         QmlContextWrapper *contextWrapper;
     };
diff --git a/src/qml/qml/qqmllistwrapper.cpp b/src/qml/qml/qqmllistwrapper.cpp
index 50f1b55b9b..cde406d8e0 100644
--- a/src/qml/qml/qqmllistwrapper.cpp
+++ b/src/qml/qml/qqmllistwrapper.cpp
@@ -46,7 +46,7 @@ using namespace QV4;
 DEFINE_OBJECT_VTABLE(QmlListWrapper);
 
 QmlListWrapper::Data::Data(QV8Engine *engine)
-    : Object::Data(QV8Engine::getV4(engine))
+    : Heap::Object(QV8Engine::getV4(engine))
     , v8(engine)
 {
     setVTable(staticVTable());
diff --git a/src/qml/qml/qqmllistwrapper_p.h b/src/qml/qml/qqmllistwrapper_p.h
index fe78079bac..f10ca21b08 100644
--- a/src/qml/qml/qqmllistwrapper_p.h
+++ b/src/qml/qml/qqmllistwrapper_p.h
@@ -61,7 +61,7 @@ namespace QV4 {
 
 struct Q_QML_EXPORT QmlListWrapper : Object
 {
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(QV8Engine *engine);
         ~Data();
         QV8Engine *v8;
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index 233624453f..96c0712378 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -123,9 +123,9 @@ private:
 
 struct QQmlLocaleData : public QV4::Object
 {
-    struct Data : Object::Data {
+    struct Data : QV4::Heap::Object {
         Data(QV4::ExecutionEngine *engine)
-            : Object::Data(engine)
+            : QV4::Heap::Object(engine)
         {
             setVTable(staticVTable());
         }
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp
index ddd934c840..1022d8f2f8 100644
--- a/src/qml/qml/qqmltypewrapper.cpp
+++ b/src/qml/qml/qqmltypewrapper.cpp
@@ -49,7 +49,7 @@ using namespace QV4;
 DEFINE_OBJECT_VTABLE(QmlTypeWrapper);
 
 QmlTypeWrapper::Data::Data(QV8Engine *engine)
-    : Object::Data(QV8Engine::getV4(engine))
+    : Heap::Object(QV8Engine::getV4(engine))
     , v8(engine)
     , mode(IncludeEnums)
 {
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h
index 995e88ecf4..5ba92cd89c 100644
--- a/src/qml/qml/qqmltypewrapper_p.h
+++ b/src/qml/qml/qqmltypewrapper_p.h
@@ -62,7 +62,7 @@ struct Q_QML_EXPORT QmlTypeWrapper : Object
 {
     enum TypeNameMode { IncludeEnums, ExcludeEnums };
 
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(QV8Engine *engine);
         ~Data();
         QV8Engine *v8;
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 7de15eac7d..89b0eb1a4f 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -77,7 +77,7 @@ struct QmlValueTypeCopy : public QmlValueTypeWrapper
 DEFINE_OBJECT_VTABLE(QmlValueTypeCopy);
 
 QmlValueTypeWrapper::Data::Data(QV8Engine *engine, ObjectType objectType)
-    : Object::Data(QV8Engine::getV4(engine))
+    : Heap::Object(QV8Engine::getV4(engine))
     , v8(engine)
     , objectType(objectType)
 {
diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index c155b88cc0..8e4e3a2f7f 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -61,7 +61,7 @@ namespace QV4 {
 struct Q_QML_EXPORT QmlValueTypeWrapper : Object
 {
     enum ObjectType { Reference, Copy };
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(QV8Engine *engine, ObjectType type);
         QV8Engine *v8;
         ObjectType objectType;
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index c8bf521767..587a58c313 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -179,9 +179,9 @@ public:
 class NamedNodeMap : public Object
 {
 public:
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(ExecutionEngine *engine, NodeImpl *data, const QList<NodeImpl *> &list)
-            : Object::Data(engine)
+            : Heap::Object(engine)
             , list(list)
             , d(data)
         {
@@ -215,9 +215,9 @@ DEFINE_OBJECT_VTABLE(NamedNodeMap);
 class NodeList : public Object
 {
 public:
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(ExecutionEngine *engine, NodeImpl *data)
-            : Object::Data(engine)
+            : Heap::Object(engine)
             , d(data)
         {
             setVTable(staticVTable());
@@ -250,9 +250,9 @@ DEFINE_OBJECT_VTABLE(NodeList);
 class NodePrototype : public Object
 {
 public:
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(ExecutionEngine *engine)
-            : Object::Data(engine)
+            : Heap::Object(engine)
         {
             setVTable(staticVTable());
 
@@ -304,9 +304,9 @@ DEFINE_OBJECT_VTABLE(NodePrototype);
 
 struct Node : public Object
 {
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(ExecutionEngine *engine, NodeImpl *data)
-            : Object::Data(engine)
+            : Heap::Object(engine)
             , d(data)
         {
             setVTable(staticVTable());
@@ -1595,9 +1595,9 @@ void QQmlXMLHttpRequest::destroyNetwork()
 
 struct QQmlXMLHttpRequestWrapper : public Object
 {
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(ExecutionEngine *engine, QQmlXMLHttpRequest *request)
-            : Object::Data(engine)
+            : Heap::Object(engine)
             , request(request)
         {
             setVTable(staticVTable());
@@ -1636,7 +1636,7 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject
             ScopedString s(scope, engine->id_prototype);
             ctor->defineDefaultProperty(s.getPointer(), ScopedObject(scope, ctor->d()->proto));
         }
-        Object *proto;
+        QV4::Object *proto;
     };
     V4_OBJECT(FunctionObject)
     static void markObjects(Heap::Base *that, ExecutionEngine *e) {
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 4ab360eb9a..61fe2a4876 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -79,7 +79,7 @@ struct StaticQtMetaObject : public QObject
 };
 
 QV4::QtObject::Data::Data(ExecutionEngine *v4, QQmlEngine *qmlEngine)
-    : Object::Data(v4)
+    : Heap::Object(v4)
 {
     setVTable(staticVTable());
 
@@ -1297,7 +1297,7 @@ ReturnedValue QtObject::method_get_inputMethod(CallContext *ctx)
 
 
 QV4::ConsoleObject::Data::Data(ExecutionEngine *v4)
-    : Object::Data(v4)
+    : Heap::Object(v4)
 {
     QV4::Scope scope(v4);
     QV4::ScopedObject o(scope, this);
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
index 19b30bcc86..a21ae0afd3 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
@@ -57,7 +57,7 @@ namespace QV4 {
 
 struct QtObject : Object
 {
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(ExecutionEngine *v4, QQmlEngine *qmlEngine);
         QObject *platform;
         QObject *application;
@@ -105,7 +105,7 @@ struct QtObject : Object
 
 struct ConsoleObject : Object
 {
-    struct Data : Object::Data {
+    struct Data : Heap::Object {
         Data(ExecutionEngine *engine);
     };