diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-07 01:34:29 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-10 17:15:11 +0100 |
commit | 4838cc89f000a2f1db4da6401fc79a75a7b86ad7 (patch) | |
tree | 112b34c7dce2591242036748f232db85bb138404 /src/qml/qml/qqmlcontextwrapper.cpp | |
parent | 4b850f3d1e79bb66a53f097ae7b7cc26db8cc2f8 (diff) |
Move data of some Qml related objects into Heap namespace.
Change-Id: I6e6b24466de1e49efd5f3eaa67db82873170445b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcontextwrapper.cpp')
-rw-r--r-- | src/qml/qml/qqmlcontextwrapper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp index c74d9ecd54..115d65ab67 100644 --- a/src/qml/qml/qqmlcontextwrapper.cpp +++ b/src/qml/qml/qqmlcontextwrapper.cpp @@ -53,7 +53,7 @@ using namespace QV4; DEFINE_OBJECT_VTABLE(QmlContextWrapper); -QmlContextWrapper::Data::Data(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext) +Heap::QmlContextWrapper::QmlContextWrapper(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext) : Heap::Object(QV8Engine::getV4(engine)) , readOnly(true) , ownsContext(ownsContext) @@ -61,10 +61,10 @@ QmlContextWrapper::Data::Data(QV8Engine *engine, QQmlContextData *context, QObje , context(context) , scopeObject(scopeObject) { - setVTable(staticVTable()); + setVTable(QV4::QmlContextWrapper::staticVTable()); } -QmlContextWrapper::Data::~Data() +Heap::QmlContextWrapper::~QmlContextWrapper() { if (context && ownsContext) context->destroy(); @@ -432,16 +432,16 @@ ReturnedValue QmlContextWrapper::qmlSingletonWrapper(QV8Engine *v8, String *name DEFINE_OBJECT_VTABLE(QQmlIdObjectsArray); -QQmlIdObjectsArray::Data::Data(ExecutionEngine *engine, QmlContextWrapper *contextWrapper) +Heap::QQmlIdObjectsArray::QQmlIdObjectsArray(ExecutionEngine *engine, QV4::QmlContextWrapper *contextWrapper) : Heap::Object(engine) , contextWrapper(contextWrapper) { - setVTable(staticVTable()); + setVTable(QV4::QQmlIdObjectsArray::staticVTable()); } ReturnedValue QQmlIdObjectsArray::getIndexed(Managed *m, uint index, bool *hasProperty) { - QQmlIdObjectsArray *This = static_cast<QQmlIdObjectsArray*>(m); + QQmlIdObjectsArray *This = static_cast<QV4::QQmlIdObjectsArray*>(m); QQmlContextData *context = This->d()->contextWrapper->getContext(); if (!context) { if (hasProperty) |