diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-06 12:44:12 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-11 13:01:57 +0200 |
commit | f9fda643ab7aa1a66e4816382f0e66499818f42a (patch) | |
tree | 10d537491f648945632ac7181557c157c891e002 /src/qml/jsruntime/qv4qobjectwrapper.cpp | |
parent | a23158a41291055aa0f546869e4c9f8efb19c2dc (diff) |
Change signature of call/construct() to take a pointer to a CallData
Change-Id: I5467aadba083e4b01fb0a7170946695207033680
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index fc26385cb7..fbe5b4484d 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1687,17 +1687,17 @@ QV4::Value QObjectMethod::method_destroy(QV4::ExecutionContext *ctx, const Value return QV4::Value::undefinedValue(); } -Value QObjectMethod::call(Managed *m, const CallData &d) +Value QObjectMethod::call(Managed *m, CallData *callData) { QObjectMethod *This = static_cast<QObjectMethod*>(m); - return This->callInternal(d); + return This->callInternal(callData); } -Value QObjectMethod::callInternal(const CallData &d) +Value QObjectMethod::callInternal(CallData *callData) { ExecutionContext *context = engine()->current; if (m_index == DestroyMethod) - return method_destroy(context, d.args, d.argc); + return method_destroy(context, callData->args, callData->argc); else if (m_index == ToStringMethod) return method_toString(context); @@ -1732,7 +1732,7 @@ Value QObjectMethod::callInternal(const CallData &d) if (method.isV4Function()) { QV4::Value rv = QV4::Value::undefinedValue(); - QQmlV4Function func(d.argc, d.args, &rv, m_qmlGlobal.value(), + QQmlV4Function func(callData->argc, callData->args, &rv, m_qmlGlobal.value(), QmlContextWrapper::getContext(m_qmlGlobal.value()), v8Engine); QQmlV4Function *funcptr = &func; @@ -1743,7 +1743,7 @@ Value QObjectMethod::callInternal(const CallData &d) return rv; } - CallArgs callArgs(d.argc, d.args); + CallArgs callArgs(callData->argc, callData->args); if (!method.isOverload()) { return CallPrecise(object, method, v8Engine, callArgs); } else { |