From 830376c9621dc8ada8e63b8b15f9abf856facfef Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 24 Aug 2015 16:18:11 +0200 Subject: Rename currentExecutionContext to currentContext Now that the other method is gone, let's use the shorter currentContext Change-Id: I2a6fb3b77f83a1ffdf314ad29081e303d17030ed Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4functionobject.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/jsruntime/qv4functionobject.cpp') diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 5a03c9e201..acb0342fc2 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -443,7 +443,7 @@ ReturnedValue ScriptFunction::construct(const Managed *that, CallData *callData) ScopedObject obj(scope, v4->newObject(ic, proto)); callData->thisObject = obj.asReturnedValue(); - Scoped ctx(scope, v4->currentExecutionContext->newCallContext(f, callData)); + Scoped ctx(scope, v4->currentContext->newCallContext(f, callData)); v4->pushContext(ctx); ScopedValue result(scope, Q_V4_PROFILE(v4, f->function())); @@ -470,7 +470,7 @@ ReturnedValue ScriptFunction::call(const Managed *that, CallData *callData) ExecutionContextSaver ctxSaver(scope); Scoped f(scope, static_cast(that)); - Scoped ctx(scope, v4->currentExecutionContext->newCallContext(f, callData)); + Scoped ctx(scope, v4->currentContext->newCallContext(f, callData)); v4->pushContext(ctx); ScopedValue result(scope, Q_V4_PROFILE(v4, f->function())); @@ -640,7 +640,7 @@ ReturnedValue BuiltinFunction::call(const Managed *that, CallData *callData) v4->pushContext(&ctx); Q_ASSERT(v4->current == &ctx); - return f->d()->code(static_cast(v4->currentExecutionContext)); + return f->d()->code(static_cast(v4->currentContext)); } ReturnedValue IndexedBuiltinFunction::call(const Managed *that, CallData *callData) @@ -664,7 +664,7 @@ ReturnedValue IndexedBuiltinFunction::call(const Managed *that, CallData *callDa v4->pushContext(&ctx); Q_ASSERT(v4->current == &ctx); - return f->d()->code(static_cast(v4->currentExecutionContext), f->d()->index); + return f->d()->code(static_cast(v4->currentContext), f->d()->index); } DEFINE_OBJECT_VTABLE(IndexedBuiltinFunction); -- cgit v1.2.3