[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=781adac

The following commit has been merged in the master branch:
commit 781adac15bf2351aa4c39cba1595cba7ee0ea0ca
Author: Vineet Garg <grg.vineet at gmail.com>
Date:   Mon Jul 13 19:55:22 2015 +0530

    Removed whitespace
---
 core/backends/lan/lanlinkprovider.cpp | 12 +++++-------
 core/backends/lan/server.h            |  4 ++--
 core/kdeconnectconfig.cpp             |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index c553754..1fb24b8 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -148,7 +148,6 @@ void LanLinkProvider::newUdpConnection()
         connect(socket, SIGNAL(connected()), this, SLOT(connected()));
         connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
         socket->connectToHost(sender, tcpPort);
-	
     }
 }
 
@@ -160,7 +159,7 @@ void LanLinkProvider::connectError()
     disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
 
     qCDebug(KDECONNECT_CORE) << socket->errorString();
-    
+
     qCDebug(KDECONNECT_CORE) << "Fallback (1), try reverse connection (send udp packet)";
     NetworkPackage np("");
     NetworkPackage::createIdentityPackage(&np);
@@ -177,7 +176,7 @@ void LanLinkProvider::connectError()
 void LanLinkProvider::connected()
 {
     qCDebug(KDECONNECT_CORE) << "Socket connected";
-    
+
     // TODO : Change the behaviour of these disconnects
     QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
     if (!socket) return;
@@ -248,7 +247,7 @@ void LanLinkProvider::connected()
 void LanLinkProvider::encrypted() {
 
     qCDebug(KDECONNECT_CORE) << "Socket encrypted";
-    
+
     QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
     if (!socket) return;
     disconnect(socket, SIGNAL(encrypted()), this, SLOT(encrypted()));
@@ -331,7 +330,7 @@ void LanLinkProvider::dataReceived()
 
     NetworkPackage* np = new NetworkPackage("");
     bool success = NetworkPackage::unserialize(data, np);
-    
+
     receivedIdentityPackages[socket].np = np;
 //     receivedIdentityPackages[socket].sender = sender;
 
@@ -445,5 +444,4 @@ void LanLinkProvider::addLink(QString deviceId, QSslSocket* socket, NetworkPacka
 
     Q_EMIT onConnectionReceived(*receivedPackage, deviceLink);
 
-}
-
+}
\ No newline at end of file
diff --git a/core/backends/lan/server.h b/core/backends/lan/server.h
index ff08d13..0e1ade2 100644
--- a/core/backends/lan/server.h
+++ b/core/backends/lan/server.h
@@ -25,8 +25,8 @@
 #include <QSslError>
 #include <QtNetwork/qsslsocket.h>
 
-class Server 
-    : public QTcpServer 
+class Server
+    : public QTcpServers
 {
 
     Q_OBJECT
diff --git a/core/kdeconnectconfig.cpp b/core/kdeconnectconfig.cpp
index ca5bf66..6a98638 100644
--- a/core/kdeconnectconfig.cpp
+++ b/core/kdeconnectconfig.cpp
@@ -131,7 +131,7 @@ KdeConnectConfig::KdeConnectConfig()
         certificateOptions.setSerialNumber(bigInteger);
         certificateOptions.setInfo(certificateInfo);
         certificateOptions.setValidityPeriod(startTime, endTime);
-    	certificateOptions.setFormat(QCA::PKCS10);
+        certificateOptions.setFormat(QCA::PKCS10);
 
 //        d->certificate = QCA::Certificate(certificateOptions, d->privateKey);
         d->certificate = QSslCertificate(QCA::Certificate(certificateOptions, d->privateKey).toPEM().toLatin1());

-- 
kdeconnect packaging