[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=752e1b1

The following commit has been merged in the master branch:
commit 752e1b1b53e6eaf7ae428af1ab43b6b18928c7db
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Jun 18 02:14:22 2013 +0200

    Implemented activity-service comunication to android app
---
 src/daemon.cpp   | 16 ++++++++++++++--
 src/daemon.h     |  4 ++--
 src/devicelink.h | 10 +++++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/daemon.cpp b/src/daemon.cpp
index cbe18c2..aa189b0 100644
--- a/src/daemon.cpp
+++ b/src/daemon.cpp
@@ -102,8 +102,8 @@ QString Daemon::listVisibleDevices()
 
     QList<Device*> visibleDevices;
 
-    foreach (DeviceLocator* dl, deviceLocators) {
-        foreach (Device* d, dl->discover()) {
+    Q_FOREACH (DeviceLocator* dl, deviceLocators) {
+        Q_FOREACH (Device* d, dl->discover()) {
             ret << std::setw(20) << d->id().toStdString();
             ret << std::setw(20) << d->name().toStdString();
             ret << std::setw(20) << dl->getName().toStdString();
@@ -122,6 +122,18 @@ bool Daemon::linkDevice(QString id)
 
 }
 
+QString Daemon::listLinkedDevices(long int id)
+{
+    QString ret;
+
+    Q_FOREACH (DeviceLink* dl, linkedDevices) {
+        ret += dl->device()->name() + "(" + dl->device()->id() + ")";
+    }
+
+    return ret;
+}
+
+
 Daemon::~Daemon()
 {
     qDebug() << "SAYONARA BABY";
diff --git a/src/daemon.h b/src/daemon.h
index 0c89e49..cda4a42 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -67,10 +67,10 @@ public Q_SLOTS:
 
     Q_SCRIPTABLE bool linkAllPairedDevices();
 
-    Q_SCRIPTABLE QString listLinkedDevices(long id);
-
 */
 
+    Q_SCRIPTABLE QString listLinkedDevices(long id);
+
 private:
 
     //Get a DeviceLink through the best DeviceLocator available
diff --git a/src/devicelink.h b/src/devicelink.h
index ed2a06d..303063b 100644
--- a/src/devicelink.h
+++ b/src/devicelink.h
@@ -25,19 +25,27 @@
 
 #include "networkpackage.h"
 
+class Device;
+
 class DeviceLink
     : public QObject
 {
     Q_OBJECT
 
 public:
-    DeviceLink();
+    DeviceLink(Device* d) : mDevice(d) { };
 
+    Device* device() { return mDevice; }
+    
     virtual void sendPackage(const NetworkPackage& np) = 0;
 
 signals:
     void receivedPackage(const NetworkPackage& np);
 
+private:
+
+    Device* mDevice;
+
 };
 
 #endif // DEVICELINK_H

-- 
kdeconnect packaging