diff options
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index aecff0f629..00882d699c 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -429,7 +429,7 @@ ReturnedValue RuntimeHelpers::objectDefaultValue(const Object *object, int typeH ScopedValue result(scope); ScopedValue conv(scope, object->get(meth1)); - JSCallData jsCallData(scope, nullptr, 0); + JSCallData jsCallData(scope, 0); jsCallData->thisObject = *object; if (FunctionObject *o = conv->as<FunctionObject>()) { @@ -982,7 +982,7 @@ ReturnedValue Runtime::method_callGlobalLookup(ExecutionEngine *engine, uint ind ReturnedValue Runtime::method_callPossiblyDirectEval(ExecutionEngine *engine, Value *argv, int argc) { Scope scope(engine); - JSCallData callData(scope, argv, argc); + JSCallData callData(scope, argc, argv); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); ExecutionContext &ctx = static_cast<ExecutionContext &>(engine->currentStackFrame->jsFrame->context); @@ -1009,7 +1009,7 @@ ReturnedValue Runtime::method_callPossiblyDirectEval(ExecutionEngine *engine, Va ReturnedValue Runtime::method_callName(ExecutionEngine *engine, int nameIndex, Value *argv, int argc) { Scope scope(engine); - JSCallData callData(scope, argv, argc); + JSCallData callData(scope, argc, argv); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); callData->function = engine->currentStackFrame->v4Function->compilationUnit->runtimeStrings[nameIndex]; @@ -1036,7 +1036,7 @@ ReturnedValue Runtime::method_callName(ExecutionEngine *engine, int nameIndex, V ReturnedValue Runtime::method_callProperty(ExecutionEngine *engine, Value *base, int nameIndex, Value *argv, int argc) { Scope scope(engine); - JSCallData callData(scope, argv, argc, base); + JSCallData callData(scope, argc, argv, base); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); if (!callData->thisObject.isObject()) { @@ -1070,7 +1070,7 @@ ReturnedValue Runtime::method_callProperty(ExecutionEngine *engine, Value *base, ReturnedValue Runtime::method_callPropertyLookup(ExecutionEngine *engine, Value *base, uint index, Value *argv, int argc) { Scope scope(engine); - JSCallData callData(scope, argv, argc, base); + JSCallData callData(scope, argc, argv, base); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); Q_ASSERT(engine->jsStackTop >= callData->args + callData->argc()); @@ -1087,7 +1087,7 @@ ReturnedValue Runtime::method_callPropertyLookup(ExecutionEngine *engine, Value ReturnedValue Runtime::method_callElement(ExecutionEngine *engine, Value *base, const Value &index, Value *argv, int argc) { Scope scope(engine); - JSCallData callData(scope, argv, argc, base); + JSCallData callData(scope, argc, argv, base); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); callData->thisObject = callData->thisObject.toObject(engine); @@ -1108,10 +1108,10 @@ ReturnedValue Runtime::method_callValue(ExecutionEngine *engine, const Value &fu return engine->throwTypeError(QStringLiteral("%1 is not a function").arg(func.toQStringNoThrow())); Scope scope(engine); - JSCallData callData(scope, func.asReturnedValue(), argv, argc); + JSCallData callData(scope, argc, argv); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); - return static_cast<FunctionObject &>(callData->function).call(&callData->thisObject, callData->args, callData->argc()); + return static_cast<const FunctionObject &>(func).call(&callData->thisObject, callData->args, callData->argc()); } |