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

The following commit has been merged in the master branch:
commit cbd68099328a6e99528230078e875a9263e4b76b
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Apr 14 21:57:34 2014 +0200

    Rename pairingTimer to m_pairingTimeout
---
 kded/device.cpp | 14 +++++++-------
 kded/device.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kded/device.cpp b/kded/device.cpp
index 20059d4..5b4ae5d 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -164,9 +164,9 @@ void Device::requestPair()
         return;
     }
 
-    pairingTimer.setSingleShot(true);
-    pairingTimer.start(30 * 1000);
-    connect(&pairingTimer, SIGNAL(timeout()),
+    m_pairingTimeut.setSingleShot(true);
+    m_pairingTimeut.start(30 * 1000); //30 seconds of timeout
+    connect(&m_pairingTimeut, SIGNAL(timeout()),
             this, SLOT(pairingTimeout()));
 
 }
@@ -294,7 +294,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
             kDebug(kdeconnect_kded()) << "Already" << (wantsPair? "paired":"unpaired");
             if (m_pairStatus == Device::Requested) {
                 m_pairStatus = Device::NotPaired;
-                pairingTimer.stop();
+                m_pairingTimeut.stop();
                 Q_EMIT pairingFailed(i18n("Canceled by other peer"));
             }
             return;
@@ -309,7 +309,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
                 kDebug(kdeconnect_kded()) << "ERROR decoding key";
                 if (m_pairStatus == Device::Requested) {
                     m_pairStatus = Device::NotPaired;
-                    pairingTimer.stop();
+                    m_pairingTimeut.stop();
                 }
                 Q_EMIT pairingFailed(i18n("Received incorrect key"));
                 return;
@@ -346,7 +346,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
             m_pairStatus = Device::NotPaired;
 
             if (prevPairStatus == Device::Requested) {
-                pairingTimer.stop();
+                m_pairingTimeut.stop();
                 Q_EMIT pairingFailed(i18n("Canceled by other peer"));
             } else if (prevPairStatus == Device::Paired) {
                 KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc");
@@ -414,7 +414,7 @@ void Device::setAsPaired()
 
     m_pairStatus = Device::Paired;
 
-    pairingTimer.stop(); //Just in case it was started
+    m_pairingTimeut.stop(); //Just in case it was started
 
     storeAsTrusted(); //Save to the config as trusted
 
diff --git a/kded/device.h b/kded/device.h
index f576d06..3f97b19 100644
--- a/kded/device.h
+++ b/kded/device.h
@@ -132,7 +132,7 @@ private:
     QMap<QString, KdeConnectPlugin*> m_plugins;
     QMultiMap<QString, KdeConnectPlugin*> m_pluginsByinterface;
 
-    QTimer pairingTimer;
+    QTimer m_pairingTimeut;
 
     void setAsPaired();
     void storeAsTrusted();

-- 
kdeconnect packaging