[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=03e9106

The following commit has been merged in the master branch:
commit 03e91062039b4bfcedaa527ed80ac3f6530c4a6b
Author: Vishesh Handa <me at vhanda.in>
Date:   Sun Apr 13 15:53:11 2014 +0200

    QAtomicInt no longer auto converts to an int
---
 KTp/telepathy-handler-application.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/KTp/telepathy-handler-application.cpp b/KTp/telepathy-handler-application.cpp
index aa78f5c..245ff88 100644
--- a/KTp/telepathy-handler-application.cpp
+++ b/KTp/telepathy-handler-application.cpp
@@ -72,7 +72,7 @@ TelepathyHandlerApplication::Private::~Private()
 
 void TelepathyHandlerApplication::Private::_k_onInitialTimeout()
 {
-    if (jobCount == 0 && jobCount.fetchAndAddOrdered(-1) == 0) {
+    if (jobCount.load() == 0 && jobCount.fetchAndAddOrdered(-1) == 0) {
         // m_jobCount is now -1
         kDebug() << "No job received. Exiting";
         QCoreApplication::quit();
@@ -81,7 +81,7 @@ void TelepathyHandlerApplication::Private::_k_onInitialTimeout()
 
 void TelepathyHandlerApplication::Private::_k_onTimeout()
 {
-    if (jobCount == 0 && jobCount.fetchAndAddOrdered(-1) == 0) {
+    if (jobCount.load() == 0 && jobCount.fetchAndAddOrdered(-1) == 0) {
         // m_jobCount is now -1
         kDebug() << "Timeout. Exiting";
         QCoreApplication::quit();
@@ -189,7 +189,7 @@ int TelepathyHandlerApplication::newJob()
             d->firstJobStarted = true;
         }
     }
-    kDebug() << "New job started." << d->jobCount << "jobs currently running";
+    kDebug() << "New job started." << d->jobCount.load() << "jobs currently running";
     return ret;
 }
 
@@ -204,7 +204,7 @@ void TelepathyHandlerApplication::jobFinished()
             d->timer->start(d->timeout);
         }
     }
-    kDebug() << "Job finished." << d->jobCount << "jobs currently running";
+    kDebug() << "Job finished." << d->jobCount.load() << "jobs currently running";
 }
 
 } // namespace KTp

-- 
ktp-common-internals packaging