From e47e1202518ab72658ab8d659b081b71fdd8609f Mon Sep 17 00:00:00 2001
From: Tomasz Sterna <tomek@xiaoka.com>
Date: Fri, 1 Aug 2014 13:24:38 +0200
Subject: Proper signtature of QDBusConnectionInterface::service(Un)Registered

---
 daemon/dbusconnector.cpp | 11 +++++------
 daemon/dbusconnector.h   |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/daemon/dbusconnector.cpp b/daemon/dbusconnector.cpp
index 1ee4c67..8bde322 100644
--- a/daemon/dbusconnector.cpp
+++ b/daemon/dbusconnector.cpp
@@ -16,8 +16,7 @@
 DBusConnector::DBusConnector(QObject *parent) :
     QObject(parent)
 {
-    QDBusConnection bus = QDBusConnection::sessionBus();
-    QDBusConnectionInterface *interface = bus.interface();
+    QDBusConnectionInterface *interface = QDBusConnection::sessionBus().interface();
 
     QDBusReply<QStringList> serviceNames = interface->registeredServiceNames();
     if (serviceNames.isValid()) {
@@ -26,8 +25,8 @@ DBusConnector::DBusConnector(QObject *parent) :
     else {
         logger()->error() << serviceNames.error().message();
     }
-    connect(interface, SIGNAL(serviceRegistered(QString&)), SLOT(onServiceRegistered(QString&)));
-    connect(interface, SIGNAL(serviceUnregistered(QString&)), SIGNAL(onServiceUnregistered(QString&)));
+    connect(interface, SIGNAL(serviceRegistered(const QString &)), SLOT(onServiceRegistered(const QString &)));
+    connect(interface, SIGNAL(serviceUnregistered(const QString &)), SLOT(onServiceUnregistered(const QString &)));
 }
 
 bool DBusConnector::findPebble()
@@ -84,13 +83,13 @@ bool DBusConnector::findPebble()
     return false;
 }
 
-void DBusConnector::onServiceRegistered(QString &name)
+void DBusConnector::onServiceRegistered(const QString &name)
 {
     logger()->debug() << "DBus service online:" << name;
     if (!dbusServices.contains(name)) dbusServices.append(name);
 }
 
-void DBusConnector::onServiceUnregistered(QString &name)
+void DBusConnector::onServiceUnregistered(const QString &name)
 {
     logger()->debug() << "DBus service offline:" << name;
     if (dbusServices.contains(name)) dbusServices.removeAll(name);
diff --git a/daemon/dbusconnector.h b/daemon/dbusconnector.h
index 7141cab..e6dd793 100644
--- a/daemon/dbusconnector.h
+++ b/daemon/dbusconnector.h
@@ -31,8 +31,8 @@ public slots:
     bool findPebble();
 
 protected slots:
-    void onServiceRegistered(QString&);
-    void onServiceUnregistered(QString&);
+    void onServiceRegistered(const QString &);
+    void onServiceUnregistered(const QString &);
 
 };
 
-- 
cgit v1.2.3