[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=cfe13a7

The following commit has been merged in the master branch:
commit cfe13a739cee87e5ba9e962bcccd45e87a7a2dd6
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Sep 26 21:34:08 2013 +0200

    Changed QSharedPointer<QIODevice> to <QTcpSocket>
    
    So we don't need a separate pointer.
---
 kded/backends/lan/downloadjob.cpp | 13 +++++++------
 kded/backends/lan/downloadjob.h   |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kded/backends/lan/downloadjob.cpp b/kded/backends/lan/downloadjob.cpp
index 58a0ac2..fe03aeb 100644
--- a/kded/backends/lan/downloadjob.cpp
+++ b/kded/backends/lan/downloadjob.cpp
@@ -24,25 +24,26 @@ DownloadJob::DownloadJob(QHostAddress address, QVariantMap transferInfo): KJob()
 {
     mAddress = address;
     mPort = transferInfo["port"].toInt();
-    mSocket = new QTcpSocket();
-    mOutput = QSharedPointer<QIODevice>(mSocket);
+    mSocket = QSharedPointer<QTcpSocket>(new QTcpSocket);
 }
 
 void DownloadJob::start()
 {
-    qDebug() << "start";
+    //qDebug() << "DownloadJob Start";
     mSocket->connectToHost(mAddress, mPort, QIODevice::ReadOnly);
-    connect(mSocket, SIGNAL(disconnected()), this, SLOT(disconnected()));
+    connect(mSocket.data(), SIGNAL(disconnected()),
+            this, SLOT(disconnected()));
     //TODO: Implement payload encryption somehow (create an intermediate iodevice to encrypt the payload here?)
 }
 
 void DownloadJob::disconnected()
 {
+    //qDebug() << "DownloadJob End";
     emitResult();
 }
 
 QSharedPointer<QIODevice> DownloadJob::getPayload()
 {
-    qDebug() << "getPayload";
-    return mOutput;
+    //qDebug() << "getPayload";
+    return mSocket.staticCast<QIODevice>();
 }
diff --git a/kded/backends/lan/downloadjob.h b/kded/backends/lan/downloadjob.h
index ff428c1..eeeab07 100644
--- a/kded/backends/lan/downloadjob.h
+++ b/kded/backends/lan/downloadjob.h
@@ -41,8 +41,7 @@ public:
 private:
     QHostAddress mAddress;
     qint16 mPort;
-    QTcpSocket* mSocket;
-    QSharedPointer<QIODevice> mOutput;
+    QSharedPointer<QTcpSocket> mSocket;
 
 
 private Q_SLOTS:

-- 
kdeconnect packaging