aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4lookup.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-11-12 14:23:18 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-11-15 13:16:47 +0100
commit124ff9c5a35061d14288fe355399b9f27d615841 (patch)
treedbad98ebb44a369412ea14b328b4699f247e9afc /src/qml/jsruntime/qv4lookup.cpp
parent3965ebb3ffc60957108d6c6f3a41eed08c4280a0 (diff)
Use the engine instead of the context where it makes sense
Change-Id: I17a3b6f4b3c076107dc9a8de667ac526566ea6e3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4lookup.cpp')
-rw-r--r--src/qml/jsruntime/qv4lookup.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp
index b3c295ed87..dde1d6c39e 100644
--- a/src/qml/jsruntime/qv4lookup.cpp
+++ b/src/qml/jsruntime/qv4lookup.cpp
@@ -112,8 +112,7 @@ ReturnedValue Lookup::indexedGetterGeneric(Lookup *l, const ValueRef object, con
ReturnedValue Lookup::indexedGetterFallback(Lookup *l, const ValueRef object, const ValueRef index)
{
Q_UNUSED(l);
- ExecutionContext *ctx = l->engine->currentContext();
- Scope scope(ctx);
+ Scope scope(l->engine);
uint idx = index->asArrayIndex();
Scoped<Object> o(scope, object);
@@ -130,7 +129,7 @@ ReturnedValue Lookup::indexedGetterFallback(Lookup *l, const ValueRef object, co
if (object->isNullOrUndefined()) {
QString message = QStringLiteral("Cannot read property '%1' of %2").arg(index->toQStringNoThrow()).arg(object->toQStringNoThrow());
- return ctx->engine()->throwTypeError(message);
+ return l->engine->throwTypeError(message);
}
o = RuntimeHelpers::convertToObject(scope.engine, object);
@@ -188,8 +187,7 @@ void Lookup::indexedSetterGeneric(Lookup *l, const ValueRef object, const ValueR
void Lookup::indexedSetterFallback(Lookup *l, const ValueRef object, const ValueRef index, const ValueRef value)
{
- ExecutionContext *ctx = l->engine->currentContext();
- Scope scope(ctx);
+ Scope scope(l->engine);
ScopedObject o(scope, object->toObject(scope.engine));
if (scope.engine->hasException)
return;