[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=640d438

The following commit has been merged in the master branch:
commit 640d438d2554d746fa99b250f6aa97c8230f3f00
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Jan 13 17:27:59 2015 +0100

    [logviewer] Port KLocalizedDate to QLocale
---
 logviewer/dates-model.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/logviewer/dates-model.cpp b/logviewer/dates-model.cpp
index 8dc4572..2cd7373 100644
--- a/logviewer/dates-model.cpp
+++ b/logviewer/dates-model.cpp
@@ -23,10 +23,10 @@
 #include <KTp/Logger/log-entity.h>
 #include <KTp/Logger/log-search-hit.h>
 #include <KTp/Logger/pending-logger-dates.h>
+#include <QLocale>
 #include <TelepathyQt/Account>
 
 #include <KLocalizedString>
-#include <klocalizeddate.h>
 
 Q_DECLARE_METATYPE(Tp::AccountPtr)
 
@@ -329,7 +329,7 @@ QVariant DatesModel::data(const QModelIndex &index, int role) const
         }
     } else if (node->type == Node::Date) {
         if (role == Qt::DisplayRole) {
-            return KLocalizedDate(node->date).formatDate();
+            return QLocale::system().toString(node->date, QLocale::ShortFormat);
         } else if (role == TypeRole) {
             return DatesModel::DateRow;
         } else if (role == HintRole) {

-- 
ktp-text-ui packaging