[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=455ada9

The following commit has been merged in the master branch:
commit 455ada9810fc0c61801dc05ca9047c93536b0e9f
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Jan 9 19:38:02 2015 +0100

    [lib] Port from KUrl to QUrl
---
 lib/chat-window-style-manager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/chat-window-style-manager.cpp b/lib/chat-window-style-manager.cpp
index ceae15e..62915ec 100644
--- a/lib/chat-window-style-manager.cpp
+++ b/lib/chat-window-style-manager.cpp
@@ -25,12 +25,12 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QDir>
+#include <QUrl>
 #include <QMimeDatabase>
 #include <QMimeType>
 
 // KDE includes
 #include <KDirLister>
-#include <KUrl>
 #include <KGlobal>
 #include <KArchive>
 #include <KZip>
@@ -61,7 +61,7 @@ public:
     // key = style id, value = ChatWindowStyle instance
     QHash<QString, ChatWindowStyle*> stylePool;
 
-    QStack<KUrl> styleDirs;
+    QStack<QUrl> styleDirs;
 };
 
 ChatWindowStyleManager *ChatWindowStyleManager::self()
@@ -90,7 +90,7 @@ void ChatWindowStyleManager::loadStyles()
 
     Q_FOREACH(const QString &styleDir, chatStyles) {
         qCDebug(KTP_TEXTUI_LIB) << styleDir;
-        d->styleDirs.push(KUrl(styleDir));
+        d->styleDirs.push(QUrl::fromUserInput(styleDir));
     }
 
     d->styleDirLister = new KDirLister(this);
@@ -264,7 +264,7 @@ bool ChatWindowStyleManager::removeStyle(const QString &styleId)
 //        // attempt to delete all dirs with this style
 //        int numDeleted = 0;
 //        Q_FOREACH(const QString& stylePath, styleDirs) {
-//            KUrl urlStyle(stylePath);
+//            QUrl urlStyle(stylePath);
 //            // Do the actual deletion of the directory style.
 //            if (KIO::NetAccess::del(urlStyle, 0))
 //                numDeleted++;

-- 
ktp-text-ui packaging