diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-10-20 16:00:56 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-07 09:00:37 +0000 |
| commit | a59d9a7eacea3614462eb910e03351cbb9d34b75 (patch) | |
| tree | 6ccb0dedfc7fd12279183aa5e5f15413c0b5e7df /src/qml/jsapi/qjsvalue.cpp | |
| parent | 98271afabd409defee3b1f09158e64fabbc35070 (diff) | |
Get rid of JSCallData::call()
Change-Id: I6b99e9a7102b3dcb6a7699f54b6456eba6248699
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsapi/qjsvalue.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index ab50301cd9..77bf587509 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -657,17 +657,17 @@ QJSValue QJSValue::call(const QJSValueList &args) Q_ASSERT(engine); Scope scope(engine); - JSCallData jsCall(scope, f, args.length()); - jsCall->thisObject = engine->globalObject; + JSCallData jsCallData(scope, f, args.length()); + jsCallData->thisObject = engine->globalObject; for (int i = 0; i < args.size(); ++i) { if (!QJSValuePrivate::checkEngine(engine, args.at(i))) { qWarning("QJSValue::call() failed: cannot call function with argument created in a different engine"); return QJSValue(); } - jsCall->args[i] = QJSValuePrivate::convertedToValue(engine, args.at(i)); + jsCallData->args[i] = QJSValuePrivate::convertedToValue(engine, args.at(i)); } - ScopedValue result(scope, jsCall.call()); + ScopedValue result(scope, f->call(jsCallData)); if (engine->hasException) result = engine->catchException(); @@ -713,17 +713,17 @@ QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList return QJSValue(); } - JSCallData jsCall(scope, f, args.size()); - jsCall->thisObject = QJSValuePrivate::convertedToValue(engine, instance); + JSCallData jsCallData(scope, f, args.size()); + jsCallData->thisObject = QJSValuePrivate::convertedToValue(engine, instance); for (int i = 0; i < args.size(); ++i) { if (!QJSValuePrivate::checkEngine(engine, args.at(i))) { qWarning("QJSValue::call() failed: cannot call function with argument created in a different engine"); return QJSValue(); } - jsCall->args[i] = QJSValuePrivate::convertedToValue(engine, args.at(i)); + jsCallData->args[i] = QJSValuePrivate::convertedToValue(engine, args.at(i)); } - ScopedValue result(scope, jsCall.call()); + ScopedValue result(scope, f->call(jsCallData)); if (engine->hasException) result = engine->catchException(); |