From 0e6195a85c5b9beceac719a7ea0c1389667bfcb3 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 24 Aug 2015 16:16:56 +0200 Subject: Cleanup usage of ExecutionEngine::currentContext Change-Id: Ic79d6da162375928ec25871cd0341daeab6483d2 Reviewed-by: Simon Hausmann --- src/imports/localstorage/plugin.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/imports') diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 22a3eed39d..ba763827d2 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE QV4::ScopedString v(scope, scope.engine->newString(desc)); \ QV4::ScopedObject ex(scope, scope.engine->newErrorObject(v)); \ ex->put(QV4::ScopedString(scope, scope.engine->newIdentifier(QStringLiteral("code"))).getPointer(), QV4::ScopedValue(scope, Primitive::fromInt32(error))); \ - args->setReturnValue(ctx->engine()->throwError(ex)); \ + args->setReturnValue(scope.engine->throwError(ex)); \ return; \ } @@ -659,7 +659,6 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) { #ifndef QT_NO_SETTINGS QV4::Scope scope(args->v4engine()); - QV4::ScopedContext ctx(scope, args->v4engine()->currentContext()); if (scope.engine->qmlEngine()->offlineStoragePath().isEmpty()) V4THROW_SQL2(SQLEXCEPTION_DATABASE_ERR, QQmlEngine::tr("SQL: can't create database, offline storage is disabled.")); @@ -721,7 +720,6 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) db->d()->version = version; if (created && dbcreationCallback) { - Scope scope(ctx); ScopedCallData callData(scope, 1); callData->thisObject = scope.engine->globalObject; callData->args[0] = db; -- cgit v1.2.3