From 4e1512baf6d1220c9e89c8a36f16de400bb1b519 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 5 Dec 2017 10:45:14 +0100 Subject: Convert more builtin functions to use the new calling convention Convert most of the methods used QML objects to the new calling convention. Converted IndexedBuiltinFunction to do the same. Change-Id: I41b26042c2f56f24988485b06e8ccd214e2573c0 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4functionobject_p.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/qml/jsruntime/qv4functionobject_p.h') diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index d61006a6b0..0687491feb 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -110,8 +110,8 @@ struct Q_QML_EXPORT BuiltinFunction : FunctionObject { ReturnedValue (*code)(const QV4::BuiltinFunction *, CallData *); }; -struct IndexedBuiltinFunction : BuiltinFunction { - inline void init(QV4::ExecutionContext *scope, uint index, ReturnedValue (*code)(const QV4::BuiltinFunction *, CallData *)); +struct IndexedBuiltinFunction : FunctionObject { + inline void init(QV4::ExecutionContext *scope, uint index, ReturnedValue (*code)(const QV4::FunctionObject *, const Value *, const Value *, int)); uint index; }; @@ -222,16 +222,16 @@ struct Q_QML_EXPORT BuiltinFunction : FunctionObject { static ReturnedValue call(const FunctionObject *f, const Value *thisObject, const Value *argv, int argc); }; -struct IndexedBuiltinFunction: BuiltinFunction +struct IndexedBuiltinFunction : FunctionObject { - V4_OBJECT2(IndexedBuiltinFunction, BuiltinFunction) + V4_OBJECT2(IndexedBuiltinFunction, FunctionObject) }; void Heap::IndexedBuiltinFunction::init(QV4::ExecutionContext *scope, uint index, - ReturnedValue (*code)(const QV4::BuiltinFunction *, CallData *)) + ReturnedValue (*code)(const QV4::FunctionObject *, const Value *thisObject, const Value *argv, int argc)) { Heap::FunctionObject::init(scope); - this->code = code; + this->jsCall = code; this->index = index; } -- cgit v1.2.3