diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-11-01 14:46:07 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-13 08:56:54 +0000 |
| commit | 76f6e6da593443daa0e35aaee0cbb1b007635c1b (patch) | |
| tree | a9ff1d3f554a650a4ca463f318504d62924b231f | |
| parent | ec55e174844734967577a99209e23c4d0769e884 (diff) | |
Convert methods of Error to new calling convention
Change-Id: I1012e5b2f7ebac32de50b7bafe8394060fe6aa86
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| -rw-r--r-- | src/qml/jsruntime/qv4errorobject.cpp | 8 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4errorobject_p.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp index 01c59dbcbe..90e158ba37 100644 --- a/src/qml/jsruntime/qv4errorobject.cpp +++ b/src/qml/jsruntime/qv4errorobject.cpp @@ -152,10 +152,10 @@ const char *ErrorObject::className(Heap::ErrorObject::ErrorType t) Q_UNREACHABLE(); } -ReturnedValue ErrorObject::method_get_stack(const BuiltinFunction *b, CallData *callData) +ReturnedValue ErrorObject::method_get_stack(const FunctionObject *b, const Value *thisObject, const Value *, int) { ExecutionEngine *v4 = b->engine(); - ErrorObject *This = callData->thisObject.as<ErrorObject>(); + const ErrorObject *This = thisObject->as<ErrorObject>(); if (!This) return v4->throwTypeError(); if (!This->d()->stack) { @@ -323,10 +323,10 @@ void ErrorPrototype::init(ExecutionEngine *engine, Object *ctor, Object *obj, He obj->defineDefaultProperty(engine->id_toString(), method_toString, 0); } -ReturnedValue ErrorPrototype::method_toString(const BuiltinFunction *b, CallData *callData) +ReturnedValue ErrorPrototype::method_toString(const FunctionObject *b, const Value *thisObject, const Value *, int) { ExecutionEngine *v4 = b->engine(); - Object *o = callData->thisObject.as<Object>(); + const Object *o = thisObject->as<Object>(); if (!o) return v4->throwTypeError(); diff --git a/src/qml/jsruntime/qv4errorobject_p.h b/src/qml/jsruntime/qv4errorobject_p.h index 9942ee1ad6..a2f00ff81e 100644 --- a/src/qml/jsruntime/qv4errorobject_p.h +++ b/src/qml/jsruntime/qv4errorobject_p.h @@ -175,7 +175,7 @@ struct ErrorObject: Object { static const char *className(Heap::ErrorObject::ErrorType t); - static ReturnedValue method_get_stack(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_get_stack(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); }; template<> @@ -286,7 +286,7 @@ struct ErrorPrototype : ErrorObject void init(ExecutionEngine *engine, Object *ctor) { init(engine, ctor, this, Heap::ErrorObject::Error); } static void init(ExecutionEngine *engine, Object *ctor, Object *obj, Heap::ErrorObject::ErrorType t); - static ReturnedValue method_toString(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_toString(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); }; struct EvalErrorPrototype : ErrorObject |