diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-05-09 12:15:23 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:18 +0200 |
commit | dba56a752c932670c0e9461f106d2bc084276b6f (patch) | |
tree | 3a669663fa85dd3d61a83c29e8961b70ac53f046 /src/qml/jsruntime/qv4functionobject_p.h | |
parent | 00fa9049112385f65ccdcad02b8712a32626d20c (diff) | |
download | qtdeclarative-dba56a752c932670c0e9461f106d2bc084276b6f.tar.gz |
Convert remaining FunctionObject's to new constructor scheme
Change-Id: I440d5b128d0ee28566ebfa82c2505a4bd97bba6b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4functionobject_p.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index 970df4408e..16377aaac5 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -134,10 +134,6 @@ struct Q_QML_EXPORT FunctionObject: Object { unsigned int formalParameterCount() { return function() ? function()->compiledFunction->nFormals : 0; } unsigned int varCount() { return function() ? function()->compiledFunction->nLocals : 0; } - FunctionObject(ExecutionContext *scope, String *name, bool createProto = false); - FunctionObject(ExecutionContext *scope, const QString &name = QString(), bool createProto = false); - FunctionObject(ExecutionContext *scope, const ReturnedValue name); - void init(String *name, bool createProto); ReturnedValue newInstance(); @@ -162,9 +158,6 @@ struct Q_QML_EXPORT FunctionObject: Object { bool strictMode() const { return d()->strictMode; } bool bindingKeyFlag() const { return d()->bindingKeyFlag; } -protected: - FunctionObject(InternalClass *ic); - static void markObjects(Managed *that, ExecutionEngine *e); }; @@ -187,7 +180,11 @@ struct FunctionCtor: FunctionObject struct FunctionPrototype: FunctionObject { - FunctionPrototype(InternalClass *ic); + struct Data : FunctionObject::Data { + Data(InternalClass *ic); + }; + V4_OBJECT + void init(ExecutionEngine *engine, Object *ctor); static ReturnedValue method_toString(CallContext *ctx); |