diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-10-16 01:36:16 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-10-19 10:29:50 +0000 |
commit | 59b860450fef906d72d6a343190ba2d45383aba6 (patch) | |
tree | 92e26d62845a5b07aeb374540393677269a501c8 /examples/dbus/complexpingpong/complexping.cpp | |
parent | 3cae29b746df804ddfa37a3e27b48bd89686d2c1 (diff) |
Polish the complexpingpong example
- Use QDBusServiceWatcher to detect that pong service became available
(QDBusConnectionInterface::serviceOwnerChanged() signal is deprecated).
- Use new connection syntax.
Task-number: QTBUG-28082
Change-Id: I7b93b961ee6d45aaeefab77fa1d1943e38b4a4c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'examples/dbus/complexpingpong/complexping.cpp')
-rw-r--r-- | examples/dbus/complexpingpong/complexping.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp index 10318fb0ed..855ef5d394 100644 --- a/examples/dbus/complexpingpong/complexping.cpp +++ b/examples/dbus/complexpingpong/complexping.cpp @@ -49,11 +49,9 @@ #include "ping-common.h" #include "complexping.h" -void Ping::start(const QString &name, const QString &oldValue, const QString &newValue) +void Ping::start(const QString &name) { - Q_UNUSED(oldValue); - - if (name != SERVICE_NAME || newValue.isEmpty()) + if (name != SERVICE_NAME) return; // open stdin for reading @@ -105,10 +103,12 @@ int main(int argc, char **argv) return 1; } + QDBusServiceWatcher serviceWatcher(SERVICE_NAME, QDBusConnection::sessionBus(), + QDBusServiceWatcher::WatchForRegistration); + Ping ping; - ping.connect(QDBusConnection::sessionBus().interface(), - SIGNAL(serviceOwnerChanged(QString,QString,QString)), - SLOT(start(QString,QString,QString))); + QObject::connect(&serviceWatcher, &QDBusServiceWatcher::serviceRegistered, + &ping, &Ping::start); QProcess pong; pong.start("./complexpong"); |