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

The following commit has been merged in the master branch:
commit dd7d4093edef11c6ebaf0f15150b8efdbb0be483
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 17 07:43:52 2015 -0800

    Removed sendPackageEncrypted from DeviceLink
---
 core/backends/devicelink.h                    |  1 -
 core/backends/lan/landevicelink.cpp           | 12 +-----------
 core/backends/loopback/loopbackdevicelink.cpp |  5 -----
 core/backends/loopback/loopbackdevicelink.h   |  1 -
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/core/backends/devicelink.h b/core/backends/devicelink.h
index c588579..a5cc3ff 100644
--- a/core/backends/devicelink.h
+++ b/core/backends/devicelink.h
@@ -49,7 +49,6 @@ public:
     LinkProvider* provider() { return mLinkProvider; }
 
     virtual bool sendPackage(NetworkPackage& np) = 0;
-    virtual bool sendPackageEncrypted(NetworkPackage& np) = 0;
 
     //user actions
     virtual void userRequestsPair() = 0;
diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index 05d62b2..1d23cd8 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -71,7 +71,7 @@ QString LanDeviceLink::name()
     return "LanLink"; // Should be same in both android and kde version
 }
 
-bool LanDeviceLink::sendPackageEncrypted(NetworkPackage& np)
+bool LanDeviceLink::sendPackage(NetworkPackage& np)
 {
     if (np.hasPayload()) {
         np.setPayloadTransferInfo(sendPayload(np)->transferInfo());
@@ -85,16 +85,6 @@ bool LanDeviceLink::sendPackageEncrypted(NetworkPackage& np)
     return (written != -1);
 }
 
-bool LanDeviceLink::sendPackage(NetworkPackage& np)
-{
-    if (np.hasPayload()) {
-        np.setPayloadTransferInfo(sendPayload(np)->transferInfo());
-    }
-
-    int written = mSocketLineReader->write(np.serialize());
-    return (written != -1);
-}
-
 UploadJob* LanDeviceLink::sendPayload(NetworkPackage& np)
 {
     QVariantMap transferInfo;
diff --git a/core/backends/loopback/loopbackdevicelink.cpp b/core/backends/loopback/loopbackdevicelink.cpp
index ef9a017..e897017 100644
--- a/core/backends/loopback/loopbackdevicelink.cpp
+++ b/core/backends/loopback/loopbackdevicelink.cpp
@@ -34,11 +34,6 @@ QString LoopbackDeviceLink::name()
     return "LoopbackLink"; // Should be similar to android
 }
 
-bool LoopbackDeviceLink::sendPackageEncrypted(NetworkPackage& input)
-{
-    return sendPackage(input);
-}
-
 bool LoopbackDeviceLink::sendPackage(NetworkPackage& input)
 {
     NetworkPackage output(QString::null);
diff --git a/core/backends/loopback/loopbackdevicelink.h b/core/backends/loopback/loopbackdevicelink.h
index 3bba578..2593559 100644
--- a/core/backends/loopback/loopbackdevicelink.h
+++ b/core/backends/loopback/loopbackdevicelink.h
@@ -34,7 +34,6 @@ public:
 
     virtual QString name() override;
     virtual bool sendPackage(NetworkPackage& np) override;
-    virtual bool sendPackageEncrypted(NetworkPackage& np) override;
 
     virtual void userRequestsPair() override { setPairStatus(Paired); }
     virtual void userRequestsUnpair() override { setPairStatus(NotPaired); }

-- 
kdeconnect packaging