aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4function_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-30 14:25:39 +0200
committerLars Knoll <lars.knoll@qt.io>2017-09-01 12:30:27 +0000
commit85fe2814a1397a17804d8eace4a70e5b7df854b6 (patch)
treeeecaf550665c886e2b1a2f3add6e91f2ba01297d /src/qml/jsruntime/qv4function_p.h
parentede52ec76ed0939ce41bb81843dc750241c6e78f (diff)
Get rid of the FunctionObject parameter to VME::exec()
Change-Id: I5b833d1f76899a5b8fceb0f4fc109b77b1b431fc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4function_p.h')
-rw-r--r--src/qml/jsruntime/qv4function_p.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index 1cfd15bbce..d5dcce58c8 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -63,15 +63,15 @@ struct Q_QML_EXPORT Function {
const CompiledData::Function *compiledFunction;
CompiledData::CompilationUnit *compilationUnit;
- ReturnedValue execute(Heap::ExecutionContext *c, CallData *callData, const FunctionObject *f = 0) {
- return code(f, callData, c, this);
+ ReturnedValue execute(Heap::ExecutionContext *c, CallData *callData) {
+ return code(callData, c, this);
}
- ReturnedValue call(Heap::ExecutionContext *c, CallData *callData, const FunctionObject *f = 0) {
- return call(f, callData, c, this);
+ ReturnedValue call(Heap::ExecutionContext *c, CallData *callData) {
+ return call(callData, c, this);
}
- typedef ReturnedValue (*Code)(const FunctionObject *, CallData *, Heap::ExecutionContext *c, Function *);
+ typedef ReturnedValue (*Code)(CallData *, Heap::ExecutionContext *c, Function *);
Code code;
const uchar *codeData;
@@ -104,12 +104,12 @@ struct Q_QML_EXPORT Function {
}
private:
- static ReturnedValue call(const FunctionObject *f, CallData *callData, Heap::ExecutionContext *context, Function *function)
+ static ReturnedValue call(CallData *callData, Heap::ExecutionContext *context, Function *function)
{
if (!function->canUseSimpleCall)
- context = ExecutionContext::newCallContext(context, function, callData, f);
+ context = ExecutionContext::newCallContext(context, function, callData);
- return function->execute(context, callData, f);
+ return function->execute(context, callData);
}
};