[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=2ff0986

The following commit has been merged in the master branch:
commit 2ff0986ba7f468b6d5931da71cf34d2665a1ec58
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Jan 9 20:35:11 2015 +0100

    [lib] Remove remaining KGlobal usage
---
 lib/chat-widget.cpp               | 3 ---
 lib/chat-window-style-manager.cpp | 1 -
 2 files changed, 4 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index f649bd8..7b6f4bd 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -148,9 +148,6 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     connect(d->shareProvider, SIGNAL(finishedSuccess(ShareProvider*,QString)), this, SLOT(onShareProviderFinishedSuccess(ShareProvider*,QString)));
     connect(d->shareProvider, SIGNAL(finishedError(ShareProvider*,QString)), this, SLOT(onShareProviderFinishedFailure(ShareProvider*,QString)));
 
-    //load translations for this library. keep this before any i18n() calls in library code
-    KGlobal::locale()->insertCatalog(QLatin1String("ktpchat"));
-
     d->chatViewInitialized = false;
     d->isGroupChat = (channel->targetHandleType() == Tp::HandleTypeContact ? false : true);
 
diff --git a/lib/chat-window-style-manager.cpp b/lib/chat-window-style-manager.cpp
index 62915ec..e0be81f 100644
--- a/lib/chat-window-style-manager.cpp
+++ b/lib/chat-window-style-manager.cpp
@@ -31,7 +31,6 @@
 
 // KDE includes
 #include <KDirLister>
-#include <KGlobal>
 #include <KArchive>
 #include <KZip>
 #include <KTar>

-- 
ktp-text-ui packaging