aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4engine.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-08-24 16:47:48 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2015-09-15 19:12:40 +0000
commitfb52dab6b41ddd6955cb14e1474f90ee5333dac9 (patch)
treea6cfe97160f1f9b1b48ba35977b13e6bdce52b47 /src/qml/jsruntime/qv4engine.cpp
parentda705f4036356a3203957c2a7852fa396227fc78 (diff)
Further cleanups
Reduce usage of ScopedContext. Change-Id: I84a6a7478065de3398fd0b21596ca1308e78ceb3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r--src/qml/jsruntime/qv4engine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 59962da1c3..58193fd68f 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -350,7 +350,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
Scope scope(this);
jsObjects[SequenceProto] = ScopedValue(scope, memoryManager->alloc<SequencePrototype>(arrayClass, arrayPrototype()));
- ScopedContext global(scope, rootContext());
+ ExecutionContext *global = rootContext();
jsObjects[Object_Ctor] = memoryManager->alloc<ObjectCtor>(global);
jsObjects[String_Ctor] = memoryManager->alloc<StringCtor>(global);
jsObjects[Number_Ctor] = memoryManager->alloc<NumberCtor>(global);
@@ -927,7 +927,7 @@ void ExecutionEngine::requireArgumentsAccessors(int n)
memcpy(argumentsAccessors, oldAccessors, oldSize*sizeof(Property));
delete [] oldAccessors;
}
- ScopedContext global(scope, scope.engine->rootContext());
+ ExecutionContext *global = rootContext();
for (int i = oldSize; i < nArgumentsAccessors; ++i) {
argumentsAccessors[i].value = ScopedValue(scope, memoryManager->alloc<ArgumentsGetterFunction>(global, i));
argumentsAccessors[i].set = ScopedValue(scope, memoryManager->alloc<ArgumentsSetterFunction>(global, i));