aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4lookup.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2014-11-07 18:51:19 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-11-12 12:13:26 +0100
commit31084c37f60a54d0d1ab2e07a79e070268540498 (patch)
tree598bf007edb899f6c0965e82b904bf7ba557d362 /src/qml/jsruntime/qv4lookup.cpp
parent73a8f5f4845d34d74470b5a524d655be9eaf6dfc (diff)
Convert methods in RuntimeHelpers to take an engine pointer
This is safer and cleaner than to use a context pointer. Change-Id: Id5ef4e6667571897cd029125a0bdc18ce299da6d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4lookup.cpp')
-rw-r--r--src/qml/jsruntime/qv4lookup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp
index 258f03c1ec..2435c9b3ff 100644
--- a/src/qml/jsruntime/qv4lookup.cpp
+++ b/src/qml/jsruntime/qv4lookup.cpp
@@ -133,7 +133,7 @@ ReturnedValue Lookup::indexedGetterFallback(Lookup *l, const ValueRef object, co
return ctx->engine()->throwTypeError(message);
}
- o = RuntimeHelpers::convertToObject(ctx, object);
+ o = RuntimeHelpers::convertToObject(scope.engine, object);
if (!o) // type error
return Encode::undefined();
}
@@ -701,7 +701,7 @@ void Lookup::setterGeneric(Lookup *l, const ValueRef object, const ValueRef valu
Scope scope(l->name->engine());
ScopedObject o(scope, object);
if (!o) {
- o = RuntimeHelpers::convertToObject(scope.engine->currentContext(), object);
+ o = RuntimeHelpers::convertToObject(scope.engine, object);
if (!o) // type error
return;
ScopedString s(scope, l->name);