diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-07-31 15:27:59 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-01 13:18:02 +0000 |
commit | 81c5febf86339c141fb75bb2c3d166ac00b26f19 (patch) | |
tree | ddb45633d88f7cf6fa7ec5684943c965cc7ff30d /src/qml/jsruntime/qv4functionobject_p.h | |
parent | 1ec824ed2f6b18705ecc4d9565f97ade5319da52 (diff) |
Fix naming of methods defined in object or class literals
Change-Id: I01b7774097a447520c85ae6766e6ca1162e921ba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4functionobject_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index a9ffa90b90..8482189bb3 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -82,7 +82,7 @@ DECLARE_HEAP_OBJECT(FunctionObject, Object) { Q_QML_PRIVATE_EXPORT void init(QV4::ExecutionContext *scope, QV4::String *name, VTable::Call call); void init(QV4::ExecutionContext *scope, QV4::String *name = nullptr, bool createProto = false); - void init(QV4::ExecutionContext *scope, QV4::Function *function, bool createProto = false); + void init(QV4::ExecutionContext *scope, QV4::Function *function, QV4::String *n = nullptr); void init(QV4::ExecutionContext *scope, const QString &name, bool createProto = false); void init(); void destroy(); @@ -115,7 +115,7 @@ DECLARE_HEAP_OBJECT(ScriptFunction, FunctionObject) { Index_Name = FunctionObject::Index_Prototype + 1, Index_Length }; - void init(QV4::ExecutionContext *scope, Function *function); + void init(QV4::ExecutionContext *scope, Function *function, QV4::String *name = nullptr); }; struct ConstructorFunction : ScriptFunction @@ -181,7 +181,7 @@ struct Q_QML_EXPORT FunctionObject: Object { static Heap::FunctionObject *createScriptFunction(ExecutionContext *scope, Function *function); static Heap::FunctionObject *createConstructorFunction(ExecutionContext *scope, Function *function, bool isDerivedConstructor); - static Heap::FunctionObject *createMemberFunction(ExecutionContext *scope, Function *function); + static Heap::FunctionObject *createMemberFunction(ExecutionContext *scope, Function *function, String *name); static Heap::FunctionObject *createBuiltinFunction(ExecutionEngine *engine, StringOrSymbol *nameOrSymbol, VTable::Call code, int argumentCount); bool strictMode() const { return d()->function ? d()->function->isStrict() : false; } |