aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4object_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-10-21 14:49:50 +0200
committerLars Knoll <lars.knoll@qt.io>2017-11-07 09:00:53 +0000
commit3f37847fc3758d66cb16e8e070c29ac5b39dbc7a (patch)
tree238252b16f4a34e9b6e1ae2c23e77030a5063aba /src/qml/jsruntime/qv4object_p.h
parente72306a6f2aeb2bddbb462c205db8fad2fb5a1a4 (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/qv4object_p.h')
-rw-r--r--src/qml/jsruntime/qv4object_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 473b872747..477e341b07 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -176,7 +176,7 @@ struct ObjectVTable
{
VTable vTable;
ReturnedValue (*call)(const Managed *, CallData *data);
- ReturnedValue (*construct)(const Managed *, CallData *data);
+ ReturnedValue (*callAsConstructor)(const Managed *, CallData *data);
ReturnedValue (*get)(const Managed *, String *name, bool *hasProperty);
ReturnedValue (*getIndexed)(const Managed *, uint index, bool *hasProperty);
bool (*put)(Managed *, String *name, const Value &value);
@@ -197,7 +197,7 @@ const QV4::ObjectVTable classname::static_vtbl = \
{ \
DEFINE_MANAGED_VTABLE_INT(classname, (std::is_same<classname::SuperClass, Object>::value) ? nullptr : &classname::SuperClass::static_vtbl.vTable), \
call, \
- construct, \
+ callAsConstructor, \
get, \
getIndexed, \
put, \
@@ -428,7 +428,7 @@ public:
{ return vtable()->instanceOf(this, var); }
protected:
- static ReturnedValue construct(const Managed *m, CallData *);
+ static ReturnedValue callAsConstructor(const Managed *m, CallData *);
static ReturnedValue call(const Managed *m, CallData *);
static ReturnedValue get(const Managed *m, String *name, bool *hasProperty);
static ReturnedValue getIndexed(const Managed *m, uint index, bool *hasProperty);