aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-10-20 16:00:56 +0200
committerLars Knoll <lars.knoll@qt.io>2017-11-07 09:00:37 +0000
commita59d9a7eacea3614462eb910e03351cbb9d34b75 (patch)
tree6ccb0dedfc7fd12279183aa5e5f15413c0b5e7df /src/qml/types
parent98271afabd409defee3b1f09158e64fabbc35070 (diff)
Get rid of JSCallData::call()
Change-Id: I6b99e9a7102b3dcb6a7699f54b6456eba6248699 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/types')
-rw-r--r--src/qml/types/qquickworkerscript.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index 8cabf062df..64949ef5ae 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -248,10 +248,10 @@ void QQuickWorkerScriptEnginePrivate::WorkerEngine::init()
QV4::ScopedString name(scope, m_v4Engine->newString(QStringLiteral("sendMessage")));
QV4::ScopedValue function(scope, QV4::BuiltinFunction::create(globalContext, name,
QQuickWorkerScriptEnginePrivate::method_sendMessage));
- QV4::JSCallData jsCall(scope, createsendconstructor, 1);
- jsCall->args[0] = function;
- jsCall->thisObject = global();
- createsend.set(scope.engine, jsCall.call());
+ QV4::JSCallData jsCallData(scope, createsendconstructor, 1);
+ jsCallData->args[0] = function;
+ jsCallData->thisObject = global();
+ createsend.set(scope.engine, createsendconstructor->call(jsCallData));
}
// Requires handle and context scope
@@ -265,10 +265,10 @@ QV4::ReturnedValue QQuickWorkerScriptEnginePrivate::WorkerEngine::sendFunction(i
QV4::ScopedFunctionObject f(scope, createsend.value());
QV4::ScopedValue v(scope);
- QV4::JSCallData jsCall(scope, f, 1);
- jsCall->args[0] = QV4::Primitive::fromInt32(id);
- jsCall->thisObject = global();
- v = jsCall.call();
+ QV4::JSCallData jsCallData(scope, f, 1);
+ jsCallData->args[0] = QV4::Primitive::fromInt32(id);
+ jsCallData->thisObject = global();
+ v = f->call(jsCallData);
if (scope.hasException())
v = scope.engine->catchException();
return v->asReturnedValue();
@@ -366,11 +366,11 @@ void QQuickWorkerScriptEnginePrivate::processMessage(int id, const QByteArray &d
QV4::Scoped<QV4::QmlContext> qmlContext(scope, script->qmlContext.value());
Q_ASSERT(!!qmlContext);
- QV4::JSCallData jsCall(scope, f, 2);
- jsCall->thisObject = workerEngine->global();
- jsCall->args[0] = qmlContext->d()->qml(); // ###
- jsCall->args[1] = value;
- jsCall.call();
+ QV4::JSCallData jsCallData(scope, f, 2);
+ jsCallData->thisObject = workerEngine->global();
+ jsCallData->args[0] = qmlContext->d()->qml(); // ###
+ jsCallData->args[1] = value;
+ f->call(jsCallData);
if (scope.hasException()) {
QQmlError error = scope.engine->catchExceptionAsQmlError();
reportScriptException(script, error);