From ed0b262de97dd92c831127909ea4c059962b86ce Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 18 Nov 2011 10:57:04 +0100 Subject: QObject::disconnect with new syntax This add an overload to disconnect which is symetrical to the new syntax of connect. It is possible to diconnect connection like this: QObject::connect( sender, &Sender::valueChanged, receiver, &Receiver::updateValue ); QObject::disconnect( sender, &Sender::valueChanged, receiver, &Receiver::updateValue ); This overload only work with pointer to member function, and not static functions or functors. The test is copied from tst_QObject::disconnect(), just changed the syntax of the connection and disconnection Change-Id: Ia8f819100cb12098e32877522b97b732b1e676a8 Reviewed-by: Bradley T. Hughes --- src/corelib/kernel/qmetaobject_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel/qmetaobject_p.h') diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 0476558a92..b99907e822 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -142,11 +142,11 @@ struct QMetaObjectPrivate const QMetaObject *rmeta = 0, int type = 0, int *types = 0); static bool disconnect(const QObject *sender, int signal_index, - const QObject *receiver, int method_index, + const QObject *receiver, int method_index, void **slot, DisconnectType = DisconnectAll); static inline bool disconnectHelper(QObjectPrivate::Connection *c, - const QObject *receiver, int method_index, - QMutex *senderMutex, DisconnectType); + const QObject *receiver, int method_index, void **slot, + QMutex *senderMutex, DisconnectType = DisconnectAll); #endif }; -- cgit v1.2.3