Begin moving the data out of Managed objects

We need to move the Data objects out of the Managed
objects, to avoid lots of trouble because inner classes
can't be forward declared in C++.

Instead move them all into a Heap namespace.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 1b29cd0b02..d7330d3912 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -867,7 +867,7 @@ struct QQuickJSContext2DPixelData : public QV4::Object
             setVTable(staticVTable());
             QV4::Scope scope(engine);
             QV4::ScopedObject o(scope, this);
-            o->setArrayType(QV4::ArrayData::Custom);
+            o->setArrayType(QV4::Heap::ArrayData::Custom);
         }
         QImage image;
     };
@@ -908,7 +908,7 @@ struct QQuickJSContext2DImageData : public QV4::Object
     static QV4::ReturnedValue method_get_height(QV4::CallContext *ctx);
     static QV4::ReturnedValue method_get_data(QV4::CallContext *ctx);
 
-    static void markObjects(QV4::HeapObject *that, QV4::ExecutionEngine *engine) {
+    static void markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *engine) {
         static_cast<QQuickJSContext2DImageData::Data *>(that)->pixelData.mark(engine);
         QV4::Object::markObjects(that, engine);
     }