diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-10-20 16:00:56 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-07 09:00:37 +0000 |
commit | a59d9a7eacea3614462eb910e03351cbb9d34b75 (patch) | |
tree | 6ccb0dedfc7fd12279183aa5e5f15413c0b5e7df /src/qml/jsruntime/qv4object.cpp | |
parent | 98271afabd409defee3b1f09158e64fabbc35070 (diff) |
Get rid of JSCallData::call()
Change-Id: I6b99e9a7102b3dcb6a7699f54b6456eba6248699
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index e22b1dbe51..c52cad69d1 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -107,9 +107,9 @@ ReturnedValue Object::getValue(const Value &thisObject, const Value &v, Property return Encode::undefined(); Scope scope(f->engine()); - JSCallData jsCall(scope, f); - jsCall->thisObject = thisObject; - return jsCall.call(); + JSCallData jsCallData(scope, f); + jsCallData->thisObject = thisObject; + return f->call(jsCallData); } bool Object::putValue(uint memberIndex, const Value &value) @@ -125,10 +125,10 @@ bool Object::putValue(uint memberIndex, const Value &value) if (set) { Scope scope(ic->engine); ScopedFunctionObject setter(scope, set); - JSCallData jsCall(scope, setter, 1); - jsCall->args[0] = value; - jsCall->thisObject = this; - jsCall.call(); + JSCallData jsCallData(scope, setter, 1); + jsCallData->args[0] = value; + jsCallData->thisObject = this; + setter->call(jsCallData); return !ic->engine->hasException; } return false; @@ -764,10 +764,10 @@ bool Object::internalPut(String *name, const Value &value) Scope scope(engine); ScopedFunctionObject setter(scope, *memberIndex); - JSCallData jsCall(scope, setter, 1); - jsCall->args[0] = value; - jsCall->thisObject = this; - jsCall.call(); + JSCallData jsCallData(scope, setter, 1); + jsCallData->args[0] = value; + jsCallData->thisObject = this; + setter->call(jsCallData); return !engine->hasException; } @@ -829,10 +829,10 @@ bool Object::internalPutIndexed(uint index, const Value &value) Scope scope(engine); ScopedFunctionObject setter(scope, *arrayIndex); - JSCallData jsCall(scope, setter, 1); - jsCall->args[0] = value; - jsCall->thisObject = this; - jsCall.call(); + JSCallData jsCallData(scope, setter, 1); + jsCallData->args[0] = value; + jsCallData->thisObject = this; + setter->call(jsCallData); return !engine->hasException; } |