diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-05-08 20:11:08 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:15 +0200 |
commit | c241320db7ea3e272f229aeee3ef9bb6cb67f4b1 (patch) | |
tree | a0bcfde1b427fe3d3d3f3b0af20f6cb4c9cff01b /src/qml/qml/v8/qqmlbuiltinfunctions_p.h | |
parent | f010fae3cf287974d40b2c90a9a3a153192b2630 (diff) |
Convert constructors for builtin functions
Change-Id: I9db595e5d6ee20a291252566a38ac3bdfff900f6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions_p.h')
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h index 0176bf05e2..73c3b8da28 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h @@ -66,6 +66,7 @@ namespace QV4 { struct QtObject : Object { struct Data : Object::Data { + Data(ExecutionEngine *v4, QQmlEngine *qmlEngine); QObject *platform; QObject *application; }; @@ -76,7 +77,6 @@ struct QtObject : Object V4_OBJECT - QtObject(ExecutionEngine *v4, QQmlEngine *qmlEngine); static ReturnedValue method_isQtObject(CallContext *ctx); static ReturnedValue method_rgba(CallContext *ctx); @@ -118,7 +118,9 @@ struct QtObject : Object struct ConsoleObject : Object { - ConsoleObject(ExecutionEngine *v4); + struct Data : Object::Data { + Data(ExecutionEngine *engine); + }; static ReturnedValue method_error(CallContext *ctx); static ReturnedValue method_log(CallContext *ctx); @@ -155,6 +157,7 @@ struct GlobalExtensions { struct QQmlBindingFunction : public QV4::FunctionObject { struct Data : FunctionObject::Data { + Data(FunctionObject *originalFunction); QV4::FunctionObject *originalFunction; // Set when the binding is created later QQmlSourceLocation bindingLocation; @@ -165,7 +168,6 @@ struct QQmlBindingFunction : public QV4::FunctionObject } __data; V4_OBJECT - QQmlBindingFunction(FunctionObject *originalFunction); void initBindingLocation(); // from caller stack trace @@ -173,7 +175,7 @@ struct QQmlBindingFunction : public QV4::FunctionObject static void markObjects(Managed *that, ExecutionEngine *e); static void destroy(Managed *that) { - static_cast<QQmlBindingFunction *>(that)->~QQmlBindingFunction(); + static_cast<QQmlBindingFunction *>(that)->d()->~Data(); } }; |