From 486948817b26da2c62802bb93a0f671715c609d4 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 28 Jul 2014 10:07:57 +0200 Subject: Move the throw methods from ExecutionContext to ExecutionEngine The methods don't require a context, and thus shouldn't be implemented there. Change-Id: If058e0c5067093a4161f2275ac4288aa2bc500f3 Reviewed-by: Simon Hausmann --- src/imports/localstorage/plugin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/imports') diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 02dc1a5078..8133202213 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -60,7 +60,7 @@ using namespace QV4; QV4::Scoped v(scope, scope.engine->newString(desc)); \ QV4::Scoped ex(scope, scope.engine->newErrorObject(v)); \ ex->put(QV4::ScopedString(scope, scope.engine->newIdentifier(QStringLiteral("code"))).getPointer(), QV4::ScopedValue(scope, Primitive::fromInt32(error))); \ - ctx->throwError(ex); \ + ctx->engine()->throwError(ex); \ return Encode::undefined(); \ } @@ -68,13 +68,13 @@ using namespace QV4; QV4::Scoped v(scope, scope.engine->newString(desc)); \ QV4::Scoped 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->throwError(ex)); \ + args->setReturnValue(ctx->engine()->throwError(ex)); \ return; \ } #define V4THROW_REFERENCE(string) { \ QV4::Scoped v(scope, scope.engine->newString(string)); \ - ctx->throwReferenceError(v); \ + ctx->engine()->throwReferenceError(v); \ return Encode::undefined(); \ } @@ -179,7 +179,7 @@ static ReturnedValue qmlsqldatabase_rows_setForwardOnly(CallContext *ctx) if (!r || r->d()->type != QQmlSqlDatabaseWrapper::Rows) V4THROW_REFERENCE("Not a SQLDatabase::Rows object"); if (ctx->d()->callData->argc < 1) - return ctx->throwTypeError(); + return ctx->engine()->throwTypeError(); r->d()->sqlQuery.setForwardOnly(ctx->d()->callData->args[0].toBoolean()); return Encode::undefined(); -- cgit v1.2.3