diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-10-21 14:49:50 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-07 09:00:53 +0000 |
commit | 3f37847fc3758d66cb16e8e070c29ac5b39dbc7a (patch) | |
tree | 238252b16f4a34e9b6e1ae2c23e77030a5063aba /src/qml/jsruntime/qv4functionobject.cpp | |
parent | e72306a6f2aeb2bddbb462c205db8fad2fb5a1a4 (diff) |
Rename the construct 'virtual' method to callAsConstructor
To make it consistent with the rest of the engine.
Change-Id: I57b98fa26134f9864c663f47371ef3e9ca16ac9c
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 21aacb68d6..5b639e01d7 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -80,7 +80,7 @@ ReturnedValue jsConstructWrapper(const QV4::FunctionObject *f, const Value *argv { Scope scope(f->engine()); JSCallData callData(scope, argc, argv); - return f->vtable()->construct(f, callData.callData(f)); + return f->vtable()->callAsConstructor(f, callData.callData(f)); } @@ -164,7 +164,7 @@ ReturnedValue FunctionObject::name() const return get(scope()->internalClass->engine->id_name()); } -ReturnedValue FunctionObject::construct(const Managed *that, CallData *) +ReturnedValue FunctionObject::callAsConstructor(const Managed *that, CallData *) { return that->engine()->throwTypeError(); } @@ -202,7 +202,7 @@ void Heap::FunctionCtor::init(QV4::ExecutionContext *scope) } // 15.3.2 -ReturnedValue FunctionCtor::construct(const Managed *that, CallData *callData) +ReturnedValue FunctionCtor::callAsConstructor(const Managed *that, CallData *callData) { Scope scope(that->engine()); Scoped<FunctionCtor> f(scope, static_cast<const FunctionCtor *>(that)); @@ -252,7 +252,7 @@ ReturnedValue FunctionCtor::construct(const Managed *that, CallData *callData) // 15.3.1: This is equivalent to new Function(...) ReturnedValue FunctionCtor::call(const Managed *that, CallData *callData) { - return construct(that, callData); + return callAsConstructor(that, callData); } DEFINE_OBJECT_VTABLE(FunctionPrototype); @@ -377,7 +377,7 @@ ReturnedValue FunctionPrototype::method_bind(const BuiltinFunction *b, CallData DEFINE_OBJECT_VTABLE(ScriptFunction); -ReturnedValue ScriptFunction::construct(const Managed *that, CallData *callData) +ReturnedValue ScriptFunction::callAsConstructor(const Managed *that, CallData *callData) { ExecutionEngine *v4 = that->engine(); const ScriptFunction *f = static_cast<const ScriptFunction *>(that); @@ -458,7 +458,7 @@ void Heap::BuiltinFunction::init(QV4::ExecutionContext *scope, QV4::String *name this->code = code; } -ReturnedValue BuiltinFunction::construct(const Managed *f, CallData *) +ReturnedValue BuiltinFunction::callAsConstructor(const Managed *f, CallData *) { return f->engine()->throwTypeError(); } @@ -517,7 +517,7 @@ ReturnedValue BoundFunction::call(const Managed *that, CallData *callData) return static_cast<FunctionObject &>(callData->function).call(&callData->thisObject, callData->args, callData->argc()); } -ReturnedValue BoundFunction::construct(const Managed *that, CallData *callData) +ReturnedValue BoundFunction::callAsConstructor(const Managed *that, CallData *callData) { const BoundFunction *f = static_cast<const BoundFunction *>(that); Heap::MemberData *boundArgs = f->boundArgs(); |