[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=43d175a

The following commit has been merged in the master branch:
commit 43d175a55b4c70674211f74801a845919c56ab86
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Apr 8 13:35:26 2011 +0100

    KApplication -> KUniqueApplication
    
    Reviewed by Martin Klapetek
---
 app/main.cpp              | 1 -
 app/telepathy-chat-ui.cpp | 2 +-
 app/telepathy-chat-ui.h   | 4 ++--
 lib/chat-widget.h         | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/main.cpp b/app/main.cpp
index a408eef..4f47e18 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -26,7 +26,6 @@
 #include <TelepathyQt4/ContactFactory>
 #include <TelepathyQt4/TextChannel>
 
-#include <KApplication>
 #include <KAboutData>
 #include <KCmdLineArgs>
 
diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index 5473394..10915a8 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -33,7 +33,7 @@ inline Tp::ChannelClassSpecList channelClassList()
 
 
 TelepathyChatUi::TelepathyChatUi()
-    : KApplication(), AbstractClientHandler(channelClassList())
+    : KUniqueApplication(), AbstractClientHandler(channelClassList())
 {
     kDebug();
 
diff --git a/app/telepathy-chat-ui.h b/app/telepathy-chat-ui.h
index 3d20015..78bebf2 100644
--- a/app/telepathy-chat-ui.h
+++ b/app/telepathy-chat-ui.h
@@ -23,10 +23,10 @@
 #include "chat-window.h"
 
 #include <TelepathyQt4/AbstractClientHandler>
-#include <KApplication>
+#include <KUniqueApplication>
 
 
-class TelepathyChatUi : public KApplication, public Tp::AbstractClientHandler
+class TelepathyChatUi : public KUniqueApplication, public Tp::AbstractClientHandler
 {
 public:
     TelepathyChatUi();
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index eba76aa..fdf5ccd 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -84,11 +84,11 @@ protected slots:
     /** send the text in the text area widget to the client handler*/
     void sendMessage();
 
-    void onChatStatusChanged(const Tp::ContactPtr & contact, Tp::ChannelChatState state);
+    void onChatStatusChanged(const Tp::ContactPtr &contact, Tp::ChannelChatState state);
 
-    void onContactPresenceChange(const Tp::ContactPtr & contact, const Tp::Presence &presence);
+    void onContactPresenceChange(const Tp::ContactPtr &contact, const Tp::Presence &presence);
 
-    void onContactAliasChanged(const Tp::ContactPtr & contact, const QString &alias);
+    void onContactAliasChanged(const Tp::ContactPtr &contact, const QString &alias);
 
     void onInputBoxChanged();
 

-- 
ktp-text-ui packaging