diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-06-03 21:10:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 12:06:09 +0200 |
| commit | c421281a0291fd48c616a6e37315364ce0553c0f (patch) | |
| tree | da71d664288d4aaaf3836a03c0c1d645a81670ea /src/qml/qml/qqmlnotifier_p.h | |
| parent | f4a683f6874b03ce3e0a2869320a9956d5a04098 (diff) | |
Adapt to connection-related changes in qtbase
The QQmlData hooks signalEmitted() and receivers() now receive the
index in the signal index range (i.e., excluding non-signal methods).
This was done to avoid Q(Meta)Object having to compute the class's
method offset; the signal offset should be sufficient for everyone.
This required adapting QQmlNotifier, QQmlBoundSignal,
QQmlPropertyCache and friends to use the signal index range whenever
a property's notify signal is involved in the internal connection
lists and property captures.
Using the signal index range also reduces the memory used for
NotifyList::notifies, since useless entries for non-signal methods
will no longer be created.
Change-Id: I62872fbea5a1f829b8b03bae3fc1e6acd84cf886
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlnotifier_p.h')
| -rw-r--r-- | src/qml/qml/qqmlnotifier_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h index 2d827aa80d..7f5606fd68 100644 --- a/src/qml/qml/qqmlnotifier_p.h +++ b/src/qml/qml/qqmlnotifier_p.h @@ -108,6 +108,8 @@ private: inline QQmlNotifier *senderAsNotifier() const; Callback callback:4; + // The index is in the range returned by QObjectPrivate::signalIndex(). + // This is different from QMetaMethod::methodIndex(). signed int sourceSignal:28; QQmlNotifierEndpoint *next; @@ -157,6 +159,10 @@ bool QQmlNotifierEndpoint::isConnected() return prev != 0; } +/*! \internal + \a sourceSignal MUST be in the signal index range (see QObjectPrivate::signalIndex()). + This is different from QMetaMethod::methodIndex(). +*/ bool QQmlNotifierEndpoint::isConnected(QObject *source, int sourceSignal) { return this->sourceSignal != -1 && senderAsObject() == source && |