[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=b0c9f48

The following commit has been merged in the master branch:
commit b0c9f48efc0224a1a0138e9d133814f78007153a
Author: Samoilenko Yuri <kinnalru at gmail.com>
Date:   Thu Jan 23 02:31:27 2014 +0400

    QObject parent semantic in Device
---
 kded/daemon.cpp |  4 ++--
 kded/device.cpp | 10 ++++++----
 kded/device.h   |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/kded/daemon.cpp b/kded/daemon.cpp
index dddb9ec..d717831 100644
--- a/kded/daemon.cpp
+++ b/kded/daemon.cpp
@@ -99,7 +99,7 @@ Daemon::Daemon(QObject *parent) : QObject(parent)
     const KConfigGroup& known = config->group("trusted_devices");
     const QStringList& list = known.groupList();
     Q_FOREACH(const QString& id, list) {
-        Device* device = new Device(id);
+        Device* device = new Device(this, id);
         connect(device, SIGNAL(reachableStatusChanged()),
                 this, SLOT(onDeviceReachableStatusChanged()));
         mDevices[id] = device;
@@ -166,7 +166,7 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*
     } else {
         //kDebug(kdeconnect_kded()) << "It is a new device";
 
-        Device* device = new Device(identityPackage, dl);
+        Device* device = new Device(this, identityPackage, dl);
         connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceReachableStatusChanged()));
         mDevices[id] = device;
 
diff --git a/kded/device.cpp b/kded/device.cpp
index ed67441..aaedcf1 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -21,8 +21,9 @@
 #include <QDBusConnection>
 #include <QFile>
 
-Device::Device(const QString& id)
-    : m_deviceId(id)
+Device::Device(QObject* parent, const QString& id)
+    : QObject(parent)
+    , m_deviceId(id)
     , m_pairStatus(Device::Paired)
     , m_protocolVersion(NetworkPackage::ProtocolVersion) //We don't know it yet
 {
@@ -45,8 +46,9 @@ Device::Device(const QString& id)
     QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
 }
 
-Device::Device(const NetworkPackage& identityPackage, DeviceLink* dl)
-    : m_deviceId(identityPackage.get<QString>("deviceId"))
+Device::Device(QObject* parent, const NetworkPackage& identityPackage, DeviceLink* dl)
+    : QObject(parent)
+    , m_deviceId(identityPackage.get<QString>("deviceId"))
     , m_deviceName(identityPackage.get<QString>("deviceName"))
     , m_deviceType(str2type(identityPackage.get<QString>("deviceType")))
     , m_pairStatus(Device::NotPaired)
diff --git a/kded/device.h b/kded/device.h
index 4750a62..901350e 100644
--- a/kded/device.h
+++ b/kded/device.h
@@ -64,14 +64,14 @@ public:
      *
      * We already know it but we need to wait for an incoming DeviceLink to communicate
      */
-    Device(const QString& id);
+    Device(QObject* parent, const QString& id);
 
     /**
      * Device known via an incoming connection sent to us via a devicelink.
      *
      * We know everything but we don't trust it yet
      */
-    Device(const NetworkPackage& np, DeviceLink* dl);
+    Device(QObject* parent, const NetworkPackage& np, DeviceLink* dl);
 
     virtual ~Device();
 

-- 
kdeconnect packaging