From 2e2cf8a54954ac7cb1ce4929f9861978228e7bf6 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 28 Dec 2014 21:51:30 -0200 Subject: Remove the old QDBusConnection::sender functionality This has been deprecated since QDBusContext was introduced (Qt 4.3). So it's time to remove the functionality. [ChangeLog][Important Behavior Change] QDBusConnection::sender() (deprecated since Qt 4.3) has changed to always return an invalid QDBusConnection. To know what connection the incoming call was received from, use QDBusContext. Change-Id: I355efb82c14e54ed718c8f892d8267e727b19118 Reviewed-by: Alex Blasche --- tests/auto/dbus/qdbusinterface/myobject.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/auto/dbus/qdbusinterface/myobject.h b/tests/auto/dbus/qdbusinterface/myobject.h index 9b337b2a28..cb350d043c 100644 --- a/tests/auto/dbus/qdbusinterface/myobject.h +++ b/tests/auto/dbus/qdbusinterface/myobject.h @@ -38,7 +38,7 @@ #include -class MyObject: public QObject +class MyObject: public QObject, protected QDBusContext { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.qtproject.QtDBus.MyObject") @@ -123,15 +123,12 @@ public: Q_INVOKABLE void ping_invokable(QDBusMessage msg) { - QDBusConnection sender = QDBusConnection::sender(); - if (!sender.isConnected()) - exit(1); - + Q_ASSERT(QDBusContext::calledFromDBus()); ++callCount; callArgs = msg.arguments(); msg.setDelayedReply(true); - if (!sender.send(msg.createReply(callArgs))) + if (!QDBusContext::connection().send(msg.createReply(callArgs))) exit(1); } @@ -139,15 +136,12 @@ public slots: void ping(QDBusMessage msg) { - QDBusConnection sender = QDBusConnection::sender(); - if (!sender.isConnected()) - exit(1); - + Q_ASSERT(QDBusContext::calledFromDBus()); ++callCount; callArgs = msg.arguments(); msg.setDelayedReply(true); - if (!sender.send(msg.createReply(callArgs))) + if (!QDBusContext::connection().send(msg.createReply(callArgs))) exit(1); } }; -- cgit v1.2.3