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

The following commit has been merged in the master branch:
commit 78597637e7e8aa9794f247b39716ce2065835434
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Jun 9 11:52:16 2014 +0200

    Missing license file
---
 kded/device.cpp | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/kded/device.cpp b/kded/device.cpp
index 5b4ae5d..ce31ae5 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -1,5 +1,32 @@
+/**
+ * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "device.h"
 
+#ifdef interface // MSVC language extension, QDBusConnection uses this as a variable name
+#undef interface
+#endif
+
+#include <QDBusConnection>
+#include <QFile>
+
 #include <KSharedConfig>
 #include <KConfigGroup>
 #include <KStandardDirs>
@@ -15,12 +42,6 @@
 #include "backends/linkprovider.h"
 #include "networkpackage.h"
 
-#ifdef interface // MSVC language extension, QDBusConnection uses this as a variable name
-#undef interface
-#endif
-#include <QDBusConnection>
-#include <QFile>
-
 Device::Device(QObject* parent, const QString& id)
     : QObject(parent)
     , m_deviceId(id)
@@ -36,7 +57,7 @@ Device::Device(QObject* parent, const QString& id)
     const QString& key = data.readEntry<QString>("publicKey", QString());
     m_publicKey = QCA::RSAPublicKey::fromPEM(key);
     
-    //TODO: It is redundant to have our own private key in every instance of Device, move this to a signleton somewhere (Daemon?)
+    //TODO: It is redundant to have our own private key in every instance of Device, move this to a singleton somewhere (Daemon?)
     const QString privateKeyPath = KStandardDirs::locateLocal("appdata", "key.pem", true, KComponentData("kdeconnect", "kdeconnect"));
     QFile privKey(privateKeyPath);
     privKey.open(QIODevice::ReadOnly);
@@ -54,7 +75,7 @@ Device::Device(QObject* parent, const NetworkPackage& identityPackage, DeviceLin
     , m_pairStatus(Device::NotPaired)
     , m_protocolVersion(identityPackage.get<int>("protocolVersion"))
 {
-    //TODO: It is redundant to have our own private key in every instance of Device, move this to a signleton somewhere (Daemon?)
+    //TODO: It is redundant to have our own private key in every instance of Device, move this to a singleton somewhere (Daemon?)
     const QString privateKeyPath = KStandardDirs::locateLocal("appdata", "key.pem", true, KComponentData("kdeconnect", "kdeconnect"));
     QFile privKey(privateKeyPath);
     privKey.open(QIODevice::ReadOnly);

-- 
kdeconnect packaging