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

The following commit has been merged in the master branch:
commit a6976f52b35c3f7ca767abfaca409fc7f5865c38
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Dec 15 20:29:01 2014 +0100

    Use qApp->quit() instead of KApplication::quit()
---
 otr-proxy/KTpProxy/proxy-service.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/otr-proxy/KTpProxy/proxy-service.cpp b/otr-proxy/KTpProxy/proxy-service.cpp
index 79c4cdc..b5e68b1 100644
--- a/otr-proxy/KTpProxy/proxy-service.cpp
+++ b/otr-proxy/KTpProxy/proxy-service.cpp
@@ -31,9 +31,6 @@
 #include <TelepathyQt/TextChannel>
 #include <TelepathyQt/PendingReady>
 
-#include <KApplication>
-
-
 ProxyService::ProxyService(const QDBusConnection &dbusConnection, OTR::Config *config, const Tp::ClientRegistrarPtr &registrar)
     : Tp::DBusService(dbusConnection),
     adaptee(this, dbusConnection),
@@ -140,7 +137,7 @@ void ProxyService::onChannelProxyClosed()
 
     // stop the application when not needed anymore
     if(channels.isEmpty()) {
-        KApplication::kApplication()->quit();
+        qApp->quit();
     }
 }
 

-- 
ktp-common-internals packaging