diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-04-23 10:17:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 05:23:34 +0200 |
| commit | 9542511b013588b2ceb132ec8b34879ec904a21e (patch) | |
| tree | 9fe2b2996878c14f61d54561f16ce64bbe096958 /src/qml/qml/qqmlnotifier_p.h | |
| parent | 6d2ed5d0b645f5af383a123e869d061b235b4b85 (diff) | |
Support and use parameters in QQmlNotifierEndpoint.
Allow QQmlNotifierEndpoint to support signals
with parameters. Update QQmlBoundSignal to use
this support.
Change-Id: Ie2a245b39283b0b66d66bd2350e8bc85fe519bb5
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlnotifier_p.h')
| -rw-r--r-- | src/qml/qml/qqmlnotifier_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h index ab0711341d..3192531786 100644 --- a/src/qml/qml/qqmlnotifier_p.h +++ b/src/qml/qml/qqmlnotifier_p.h @@ -59,7 +59,7 @@ private: friend class QQmlData; friend class QQmlNotifierEndpoint; - static void emitNotify(QQmlNotifierEndpoint *); + static void emitNotify(QQmlNotifierEndpoint *, void **a); QQmlNotifierEndpoint *endpoints; }; @@ -69,7 +69,7 @@ public: inline QQmlNotifierEndpoint(); inline ~QQmlNotifierEndpoint(); - typedef void (*Callback)(QQmlNotifierEndpoint *); + typedef void (*Callback)(QQmlNotifierEndpoint *, void **); Callback callback; inline bool isConnected(); @@ -124,7 +124,8 @@ QQmlNotifier::~QQmlNotifier() void QQmlNotifier::notify() { - if (endpoints) emitNotify(endpoints); + void *args[] = { 0 }; + if (endpoints) emitNotify(endpoints, args); } QQmlNotifierEndpoint::QQmlNotifierEndpoint() |