[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=3e344ff

The following commit has been merged in the master branch:
commit 3e344ffe05b75b91b41af918d703bbe3b513a84c
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Jan 9 20:31:22 2015 +0100

    [lib] Port KNotification usage away from KComponentData
---
 lib/notify-filter.cpp     | 10 +---------
 lib/otr-notifications.cpp |  2 --
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/notify-filter.cpp b/lib/notify-filter.cpp
index b44b806..20cb3b0 100644
--- a/lib/notify-filter.cpp
+++ b/lib/notify-filter.cpp
@@ -20,8 +20,6 @@
 
 #include "notify-filter.h"
 
-#include <KAboutData>
-#include <KComponentData>
 #include <KNotification>
 #include <KLocalizedString>
 
@@ -31,12 +29,6 @@ NotifyFilter::NotifyFilter(ChatWidget *widget) :
 {
 }
 
-// TODO: when d_ed makes this available in a libarary, like he
-// said in chat-widget.cpp, replace this
-static QString telepathyComponentName() {
-    return QStringLiteral("ktelepathy");
-}
-
 void NotifyFilter::filterMessage(KTp::Message &message, const KTp::MessageContext &context) {
 
     // don't notify of past messages
@@ -78,7 +70,7 @@ void NotifyFilter::filterMessage(KTp::Message &message, const KTp::MessageContex
                 | KNotification::CloseWhenWidgetActivated
                 | KNotification::CloseOnTimeout);
 
-    notification->setComponentName(telepathyComponentName());
+    notification->setComponentName(QStringLiteral("ktelepathy"));
     notification->setTitle(i18n("%1 has sent you a message",
                                 message.senderAlias()));
 
diff --git a/lib/otr-notifications.cpp b/lib/otr-notifications.cpp
index bcd18ee..262f05c 100644
--- a/lib/otr-notifications.cpp
+++ b/lib/otr-notifications.cpp
@@ -26,8 +26,6 @@
 #include <QWidget>
 #include <QObject>
 
-#include <KAboutData>
-#include <KComponentData>
 #include <KNotification>
 #include <KLocalizedString>
 

-- 
ktp-text-ui packaging