diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-07 03:13:29 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-11 03:10:59 +0100 |
commit | b7d9a8fd5baa6ae64fbac1ca40748470a33fbf9e (patch) | |
tree | caf6e150ddc5ce33314b706f9b7ada9b07f09cea /src/quick/items/qquickview.cpp | |
parent | 766c878618934d64bb8b459f29aa489bf99de14f (diff) |
Move data for objects in QtQuick into the Heap namespace
Change-Id: Ic9d5946a8e60d235b8442b964dd1478363626441
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/qquickview.cpp')
-rw-r--r-- | src/quick/items/qquickview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index 907d56812b..004880b15c 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -48,15 +48,15 @@ QT_BEGIN_NAMESPACE -DEFINE_OBJECT_VTABLE(QQuickRootItemMarker); +DEFINE_OBJECT_VTABLE(QV4::QQuickRootItemMarker); -QV4::Returned<QQuickRootItemMarker> *QQuickRootItemMarker::create(QQmlEngine *engine, QQuickWindow *window) +QV4::Returned<QV4::QQuickRootItemMarker> *QV4::QQuickRootItemMarker::create(QQmlEngine *engine, QQuickWindow *window) { QV4::ExecutionEngine *e = QQmlEnginePrivate::getV4Engine(engine); return e->memoryManager->alloc<QQuickRootItemMarker>(e, window); } -void QQuickRootItemMarker::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *e) +void QV4::QQuickRootItemMarker::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *e) { QQuickItem *root = static_cast<QQuickRootItemMarker::Data *>(that)->window->contentItem(); if (root) { @@ -82,7 +82,7 @@ void QQuickViewPrivate::init(QQmlEngine* e) { QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine.data()); QV4::Scope scope(v4); - QV4::Scoped<QQuickRootItemMarker> v(scope, QQuickRootItemMarker::create(engine.data(), q)); + QV4::Scoped<QV4::QQuickRootItemMarker> v(scope, QV4::QQuickRootItemMarker::create(engine.data(), q)); rootItemMarker = v; } |