diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-03 15:51:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-03 20:35:24 +0200 |
| commit | a336ca4cc35fdcabedf4ff2614cc6d6625e7d4ef (patch) | |
| tree | 76d4f14dc81051a255d7b82a8d40c2d0e30a7465 /src/quick/items/qquickitem.cpp | |
| parent | db628b278bdf67edbcfd60a4502dcc283f7a502d (diff) | |
Get rid of QV8Engine::toQObject and QV8QObjectWrapper::toQObject
Change-Id: I8726148093079b3385c6b0f16284af0b5ba92066
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index fb64fa854c..659058d70f 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3755,11 +3755,12 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const { if (args->length() != 0) { v8::Handle<v8::Value> item = (*args)[0]; - QV8Engine *engine = args->engine(); QQuickItem *itemObj = 0; - if (!item->IsNull()) - itemObj = qobject_cast<QQuickItem*>(engine->toQObject(item->v4Value())); + if (!item->IsNull()) { + if (QV4::QObjectWrapper *qobjectWrapper = item->v4Value().as<QV4::QObjectWrapper>()) + itemObj = qobject_cast<QQuickItem*>(qobjectWrapper->object()); + } if (!itemObj && !item->IsNull()) { qmlInfo(this) << "mapFromItem() given argument \"" << item->v4Value().toQString() @@ -3827,11 +3828,12 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const { if (args->length() != 0) { v8::Handle<v8::Value> item = (*args)[0]; - QV8Engine *engine = args->engine(); QQuickItem *itemObj = 0; - if (!item->IsNull()) - itemObj = qobject_cast<QQuickItem*>(engine->toQObject(item->v4Value())); + if (!item->IsNull()) { + if (QV4::QObjectWrapper *qobjectWrapper = item->v4Value().as<QV4::QObjectWrapper>()) + itemObj = qobject_cast<QQuickItem*>(qobjectWrapper->object()); + } if (!itemObj && !item->IsNull()) { qmlInfo(this) << "mapToItem() given argument \"" << item->v4Value().toQString() |