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

The following commit has been merged in the master branch:
commit 9a9333035a9ad19a9c9bdcdc5502167e9bee7e68
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Tue Sep 23 19:45:29 2014 +0200

    Use QString::toLatin instead of deprecated toAscii
---
 core/daemon.cpp         | 8 ++++----
 core/networkpackage.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/daemon.cpp b/core/daemon.cpp
index eca397b..20afff2 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -100,16 +100,16 @@ Daemon::Daemon(QObject *parent)
         //http://delta.affinix.com/docs/qca/rsatest_8cpp-example.html
         if (config->group("myself").hasKey("privateKey")) {
             //Migration from older versions of KDE Connect
-            privKey.write(config->group("myself").readEntry<QString>("privateKey",QCA::KeyGenerator().createRSA(2048).toPEM()).toAscii());
+            privKey.write(config->group("myself").readEntry<QString>("privateKey",QCA::KeyGenerator().createRSA(2048).toPEM()).toLatin1());
         } else {
-            privKey.write(QCA::KeyGenerator().createRSA(2048).toPEM().toAscii());
+            privKey.write(QCA::KeyGenerator().createRSA(2048).toPEM().toLatin1());
         }
         privKey.close();
 
         config->group("myself").writeEntry("privateKeyPath", privateKeyPath);
         config->sync();
     }
-    
+
     if (QFile::permissions(config->group("myself").readEntry("privateKeyPath")) != strict)
     {
         qCDebug(KDECONNECT_CORE) << "Error: KDE Connect detects wrong permissions for private file " << config->group("myself").readEntry("privateKeyPath");
@@ -132,7 +132,7 @@ Daemon::Daemon(QObject *parent)
         d->mDevices[id] = device;
         Q_EMIT deviceAdded(id);
     }
-    
+
     //Listen to connectivity changes
     QNetworkSession* network = new QNetworkSession(QNetworkConfigurationManager().defaultConfiguration());
     Q_FOREACH (LinkProvider* a, d->mLinkProviders) {
diff --git a/core/networkpackage.cpp b/core/networkpackage.cpp
index 8bf50d2..bea3eaa 100644
--- a/core/networkpackage.cpp
+++ b/core/networkpackage.cpp
@@ -186,7 +186,7 @@ bool NetworkPackage::decrypt(QCA::PrivateKey& key, NetworkPackage* out) const
 
     QByteArray decryptedJson;
     Q_FOREACH(const QString& chunk, chunks) {
-        const QByteArray encryptedChunk = QByteArray::fromBase64(chunk.toAscii());
+        const QByteArray encryptedChunk = QByteArray::fromBase64(chunk.toLatin1());
         QCA::SecureArray decryptedChunk;
         bool success = key.decrypt(encryptedChunk, &decryptedChunk, NetworkPackage::EncryptionAlgorithm);
         if (!success) {

-- 
kdeconnect packaging