From 2fadffdc4630eca35d775d973a368feae2630bd9 Mon Sep 17 00:00:00 2001 From: Oleg Shparber Date: Wed, 31 Dec 2014 10:42:15 -0800 Subject: Use QV4::ScopedFunctionObject typedef instead of actual type Change-Id: I6b4effaa5bef992b4ae9402eea7fe655bc7b18f0 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4stringobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/jsruntime/qv4stringobject.cpp') diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 4dd4d5a8d4..df6c8c44a5 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -387,7 +387,7 @@ ReturnedValue StringPrototype::method_match(CallContext *context) // ### use the standard builtin function, not the one that might be redefined in the proto ScopedString execString(scope, scope.engine->newString(QStringLiteral("exec"))); - Scoped exec(scope, scope.engine->regExpPrototype.asObject()->get(execString)); + ScopedFunctionObject exec(scope, scope.engine->regExpPrototype.asObject()->get(execString)); ScopedCallData callData(scope, 1); callData->thisObject = rx; @@ -536,7 +536,7 @@ ReturnedValue StringPrototype::method_replace(CallContext *ctx) QString result; ScopedValue replacement(scope); ScopedValue replaceValue(scope, ctx->argument(1)); - Scoped searchCallback(scope, replaceValue); + ScopedFunctionObject searchCallback(scope, replaceValue); if (!!searchCallback) { result.reserve(string.length() + 10*numStringMatches); ScopedCallData callData(scope, numCaptures + 2); -- cgit v1.2.3