aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4functionobject_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-10-20 14:50:19 +0200
committerLars Knoll <lars.knoll@qt.io>2017-11-07 09:00:23 +0000
commit7287690a41ab762c0c4efe02632efeaf3e0187b4 (patch)
treeb5f1a04748b005119ee4d2f0693f50d80c8ec5c2 /src/qml/jsruntime/qv4functionobject_p.h
parentfb84c9b4f860ee71d0584207f4c0f1d70d96755c (diff)
Change signature of call/construct
Change-Id: I139a7a31651d9a2ea46ced88978ac4633294bc60 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject_p.h')
-rw-r--r--src/qml/jsruntime/qv4functionobject_p.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 36f873e1a2..f5354aed08 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -64,8 +64,8 @@ namespace QV4 {
struct BuiltinFunction;
struct IndexedBuiltinFunction;
-typedef ReturnedValue (*jsCallFunction)(const Managed *, CallData *data);
-typedef ReturnedValue (*jsConstructFunction)(const Managed *, CallData *data);
+typedef ReturnedValue (*jsCallFunction)(const FunctionObject *, const Value *thisObject, const Value *argv, int argc);
+typedef ReturnedValue (*jsConstructFunction)(const FunctionObject *, const Value *argv, int argc);
namespace Heap {
@@ -155,11 +155,11 @@ struct Q_QML_EXPORT FunctionObject: Object {
void init(String *name, bool createProto);
- ReturnedValue construct(CallData *callData) {
- return d()->jsConstruct(this, callData);
+ ReturnedValue construct(const Value *argv, int argc) const {
+ return d()->jsConstruct(this, argv, argc);
}
- ReturnedValue call(CallData *callData) {
- return d()->jsCall(this, callData);
+ ReturnedValue call(const Value *thisObject, const Value *argv, int argc) const {
+ return d()->jsCall(this, thisObject, argv, argc);
}
static ReturnedValue construct(const Managed *that, CallData *);
static ReturnedValue call(const Managed *that, CallData *d);