[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=9a0d110

The following commit has been merged in the master branch:
commit 9a0d1107698ff0f248730e82ce7f0e936b4134a4
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Sep 3 02:14:27 2013 +0200

    Removed unused includes and fixed indentation in some lines
---
 kded/device.cpp                                  | 12 ++++++------
 kded/networkpackage.cpp                          |  6 +++---
 kded/networkpackagetypes.h                       |  2 +-
 kded/plugins/mpriscontrol/mpriscontrolplugin.cpp |  1 +
 kded/plugins/mpriscontrol/mpriscontrolplugin.h   |  3 ---
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/kded/device.cpp b/kded/device.cpp
index 4d2cf80..87a0074 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -44,15 +44,15 @@ Device::Device(const NetworkPackage& identityPackage, DeviceLink* dl)
     m_deviceId = identityPackage.get<QString>("deviceId");
     m_deviceName = identityPackage.get<QString>("deviceName");
 
-	int protocolVersion = identityPackage.get<int>("protocolVersion");
-	if (protocolVersion != NetworkPackage::ProtocolVersion) {
-		qDebug() << "WARNING: Device uses a different protocol version" << protocolVersion << "expected" << NetworkPackage::ProtocolVersion;
-		//TODO: Do something
-	}
+    int protocolVersion = identityPackage.get<int>("protocolVersion");
+    if (protocolVersion != NetworkPackage::ProtocolVersion) {
+        qDebug() << "WARNING: Device uses a different protocol version" << protocolVersion << "expected" << NetworkPackage::ProtocolVersion;
+        //TODO: Do something
+    }
 
     addLink(dl);
 
-    m_pairStatus = Device::Device::NotPaired;
+    m_pairStatus = Device::NotPaired;
 
     //Register in bus
     QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
diff --git a/kded/networkpackage.cpp b/kded/networkpackage.cpp
index c8c4c9f..74bbdf4 100644
--- a/kded/networkpackage.cpp
+++ b/kded/networkpackage.cpp
@@ -118,9 +118,9 @@ bool NetworkPackage::decrypt (QCA::PrivateKey& key, NetworkPackage* out) const
         QByteArray encryptedChunk = QByteArray::fromBase64(chunk.toAscii());
         QCA::SecureArray decryptedChunk;
         bool success = key.decrypt(encryptedChunk, &decryptedChunk, NetworkPackage::EncryptionAlgorithm);
-		if (!success) {
-			return false;
-		}
+        if (!success) {
+            return false;
+        }
         decryptedJson.append(decryptedChunk.toByteArray());
 
     }
diff --git a/kded/networkpackagetypes.h b/kded/networkpackagetypes.h
index 915f6c1..1fde97e 100644
--- a/kded/networkpackagetypes.h
+++ b/kded/networkpackagetypes.h
@@ -23,8 +23,8 @@
 
 #define PACKAGE_TYPE_IDENTITY QString("kdeconnect.identity")
 #define PACKAGE_TYPE_PAIR QString("kdeconnect.pair")
-#define PACKAGE_TYPE_PING QString("kdeconnect.ping")
 #define PACKAGE_TYPE_ENCRYPTED QString("kdeconnect.encrypted")
+#define PACKAGE_TYPE_PING QString("kdeconnect.ping")
 #define PACKAGE_TYPE_NOTIFICATION QString("kdeconnect.notification")
 #define PACKAGE_TYPE_BATTERY QString("kdeconnect.battery")
 #define PACKAGE_TYPE_TELEPHONY QString("kdeconnect.telephony")
diff --git a/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp b/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp
index 012a381..3b46204 100644
--- a/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp
+++ b/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp
@@ -22,6 +22,7 @@
 
 #include "propertiesdbusinterface.h"
 
+#include <QDBusArgument>
 #include <QDebug>
 #include <QDBusConnection>
 #include <QDBusInterface>
diff --git a/kded/plugins/mpriscontrol/mpriscontrolplugin.h b/kded/plugins/mpriscontrol/mpriscontrolplugin.h
index 25bf227..61a1f78 100644
--- a/kded/plugins/mpriscontrol/mpriscontrolplugin.h
+++ b/kded/plugins/mpriscontrol/mpriscontrolplugin.h
@@ -21,13 +21,10 @@
 #ifndef MPRISCONTROLPLUGIN_H
 #define MPRISCONTROLPLUGIN_H
 
-#include <QSet>
 #include <QString>
 #include <QHash>
-#include <QDBusArgument>
 
 #include "../kdeconnectplugin.h"
-#include "mprisdbusinterface.h"
 
 class MprisControlPlugin
     : public KdeConnectPlugin

-- 
kdeconnect packaging