diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-27 16:15:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-30 08:05:48 +0200 |
| commit | e57c2c8a0adef8949f69195573d149237814bed1 (patch) | |
| tree | 12e15bc037183967cde5278dd1c08d5c2e969977 /src/quick/items/qquickloader.cpp | |
| parent | 0e36db9f1179d1bdf0710494e98ff7aee1a2d836 (diff) | |
remove more uses of QV4::Value
Change-Id: I11b0b2b7626297e2c98dc77784574da4b59ba8cf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/qquickloader.cpp')
| -rw-r--r-- | src/quick/items/qquickloader.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index a59c308354..48b934e1e1 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -569,13 +569,14 @@ void QQuickLoader::setSource(QQmlV4Function *args) bool ipvError = false; args->setReturnValue(QV4::Encode::undefined()); - QV4::Value ipv = d->extractInitialPropertyValues(args, this, &ipvError); + QV4::Scope scope(args->v4engine()); + QV4::ScopedValue ipv(scope, d->extractInitialPropertyValues(args, this, &ipvError)); if (ipvError) return; d->clear(); QUrl sourceUrl = d->resolveSourceUrl(args); - if (!ipv.isUndefined()) { + if (!ipv->isUndefined()) { d->disposeInitialPropertyValues(); d->initialPropertyValues = ipv.asReturnedValue(); d->qmlGlobalForIpv = args->qmlGlobal(); @@ -937,7 +938,7 @@ QUrl QQuickLoaderPrivate::resolveSourceUrl(QQmlV4Function *args) return context->resolvedUrl(QUrl(arg)); } -QV4::Value QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error) +QV4::ReturnedValue QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error) { QV4::Scope scope(args->v4engine()); QV4::ScopedValue valuemap(scope, QV4::Primitive::undefinedValue()); @@ -952,7 +953,7 @@ QV4::Value QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Function *arg } } - return valuemap; + return valuemap.asReturnedValue(); } #include <moc_qquickloader_p.cpp> |