diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 23:04:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-08 16:39:07 +0100 |
| commit | ec8f1f68d623ae68cc7d79e19067884532e3db6f (patch) | |
| tree | ccf08fdf46e677931ba839228c444f24bcbb202e /src/quick/items | |
| parent | 9d1cd3098a066c7b6689d4776bfd3a25621a26fc (diff) | |
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>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickview.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickview_p.h | 2 |
3 files changed, 4 insertions, 4 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); } diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index ae33f9261c..907d56812b 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -56,7 +56,7 @@ QV4::Returned<QQuickRootItemMarker> *QQuickRootItemMarker::create(QQmlEngine *en return e->memoryManager->alloc<QQuickRootItemMarker>(e, window); } -void QQuickRootItemMarker::markObjects(QV4::HeapObject *that, QV4::ExecutionEngine *e) +void QQuickRootItemMarker::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *e) { QQuickItem *root = static_cast<QQuickRootItemMarker::Data *>(that)->window->contentItem(); if (root) { diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h index 7e39ed89b2..3fc6cee54e 100644 --- a/src/quick/items/qquickview_p.h +++ b/src/quick/items/qquickview_p.h @@ -110,7 +110,7 @@ struct QQuickRootItemMarker : public QV4::Object static QV4::Returned<QQuickRootItemMarker> *create(QQmlEngine *engine, QQuickWindow *window); - static void markObjects(QV4::HeapObject *that, QV4::ExecutionEngine *e); + static void markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *e); }; |