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/qqmlglobal_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/qqmlglobal_p.h')
-rw-r--r-- | src/qml/qml/qqmlglobal_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index 75974a4e7c..b52e55c61b 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -164,7 +164,7 @@ T qmlobject_cast(QObject *object) return 0; } -bool Q_QML_PRIVATE_EXPORT QQml_isSignalConnected(QObject*, int, int); +bool Q_QML_PRIVATE_EXPORT QQml_isSignalConnected(QObject*, int); #define IS_SIGNAL_CONNECTED(Sender, SenderType, Name, Arguments) \ do { \ @@ -172,8 +172,7 @@ do { \ void (SenderType::*signal)Arguments = &SenderType::Name; \ static QMetaMethod method = QMetaMethod::fromSignal(signal); \ static int signalIdx = QMetaObjectPrivate::signalIndex(method); \ - static int methodIdx = method.methodIndex(); \ - return QQml_isSignalConnected(sender, signalIdx, methodIdx); \ + return QQml_isSignalConnected(sender, signalIdx); \ } while (0) struct QQmlGraphics_DerivedObject : public QObject |