Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7

1 files changed, 24 insertions, 24 deletions

diff --git a/src/qml/jsruntime/qv4arrayobject_p.h b/src/qml/jsruntime/qv4arrayobject_p.h
index f00c0c0249..689752433b 100644
--- a/src/qml/jsruntime/qv4arrayobject_p.h
+++ b/src/qml/jsruntime/qv4arrayobject_p.h
@@ -78,30 +78,30 @@ struct ArrayPrototype: ArrayObject
 {
     void init(ExecutionEngine *engine, Object *ctor);
 
-    static ReturnedValue method_isArray(CallContext *ctx);
-    static ReturnedValue method_toString(CallContext *ctx);
-    static ReturnedValue method_toLocaleString(CallContext *ctx);
-    static ReturnedValue method_concat(CallContext *ctx);
-    static ReturnedValue method_find(CallContext *ctx);
-    static ReturnedValue method_findIndex(CallContext *ctx);
-    static ReturnedValue method_join(CallContext *ctx);
-    static ReturnedValue method_pop(CallContext *ctx);
-    static ReturnedValue method_push(CallContext *ctx);
-    static ReturnedValue method_reverse(CallContext *ctx);
-    static ReturnedValue method_shift(CallContext *ctx);
-    static ReturnedValue method_slice(CallContext *ctx);
-    static ReturnedValue method_sort(CallContext *ctx);
-    static ReturnedValue method_splice(CallContext *ctx);
-    static ReturnedValue method_unshift(CallContext *ctx);
-    static ReturnedValue method_indexOf(CallContext *ctx);
-    static ReturnedValue method_lastIndexOf(CallContext *ctx);
-    static ReturnedValue method_every(CallContext *ctx);
-    static ReturnedValue method_some(CallContext *ctx);
-    static ReturnedValue method_forEach(CallContext *ctx);
-    static ReturnedValue method_map(CallContext *ctx);
-    static ReturnedValue method_filter(CallContext *ctx);
-    static ReturnedValue method_reduce(CallContext *ctx);
-    static ReturnedValue method_reduceRight(CallContext *ctx);
+    static void method_isArray(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_toString(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_toLocaleString(const BuiltinFunction *builtin, Scope &, CallData *callData);
+    static void method_concat(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_find(const BuiltinFunction *, Scope &scope, CallData *callData);
+    static void method_findIndex(const BuiltinFunction *, Scope &scope, CallData *callData);
+    static void method_join(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_pop(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_push(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_reverse(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_shift(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_slice(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_sort(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_splice(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_unshift(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_indexOf(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_lastIndexOf(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_every(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_some(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_forEach(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_map(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_filter(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_reduce(const BuiltinFunction *, Scope &, CallData *callData);
+    static void method_reduceRight(const BuiltinFunction *, Scope &, CallData *callData);
 };