aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlglobal_p.h
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-06-15 11:47:56 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-27 05:08:52 +0200
commit6afc3be37712416aa56940848aebe7682ad9e88f (patch)
tree1744e0c5e6e55103921f9de44e86162b552461bd /src/qml/qml/qqmlglobal_p.h
parentfbd2995c6165c05a0c1aea3b6e23cb4d6745d561 (diff)
Implement QAbstractDeclarativeData::isSignalConnected hook
QQml_isSignalConnected is no longer needed, since QObjectPrivate::isSignalConnected will now call the declarativeData hook. Change-Id: I0685b0fa909d6c6c2d275bfa8d41100d9926a046 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlglobal_p.h')
-rw-r--r--src/qml/qml/qqmlglobal_p.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index c237af6a7c..b3e8eb6421 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -164,15 +164,13 @@ T qmlobject_cast(QObject *object)
return 0;
}
-bool Q_QML_PRIVATE_EXPORT QQml_isSignalConnected(QObject*, int);
-
#define IS_SIGNAL_CONNECTED(Sender, SenderType, Name, Arguments) \
do { \
QObject *sender = (Sender); \
void (SenderType::*signal)Arguments = &SenderType::Name; \
static QMetaMethod method = QMetaMethod::fromSignal(signal); \
static int signalIdx = QMetaObjectPrivate::signalIndex(method); \
- return QQml_isSignalConnected(sender, signalIdx); \
+ return QObjectPrivate::get(sender)->isSignalConnected(signalIdx); \
} while (0)
struct QQmlGraphics_DerivedObject : public QObject