[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=0f9c8f0

The following commit has been merged in the master branch:
commit 0f9c8f0efca989b94e2b9c7a5154c01bba54f8ce
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Jan 9 18:09:18 2015 +0100

    [lib] Port KMimeType to QMime* stuff
---
 lib/chat-widget.cpp               | 7 ++++---
 lib/chat-window-style-manager.cpp | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 66fbaa9..ce08189 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -37,6 +37,8 @@
 #include <QAction>
 #include <QMenu>
 #include <QSortFilterProxyModel>
+#include <QMimeType>
+#include <QMimeDatabase>
 
 #include <KColorDialog>
 #include <KNotification>
@@ -44,7 +46,6 @@
 #include <KComponentData>
 #include <KColorScheme>
 #include <KLineEdit>
-#include <KMimeType>
 #include <KTemporaryFile>
 #include <KFileDialog>
 #include <KMessageWidget>
@@ -450,8 +451,8 @@ void ChatWidget::dropEvent(QDropEvent *e)
         Q_FOREACH(const QUrl &url, data->urls()) {
             if (url.isLocalFile()) {
 		 // Not sure if this the best way to determine the MIME type of the file
-		 KMimeType::Ptr ptr = KMimeType::findByUrl(url);
-		 QString mime       = ptr->name();
+        QMimeDatabase db;
+        QString mime = db.mimeTypeForUrl(url).name();
 		 if (mime.startsWith(QLatin1String("image/"))) {
 		    d->fileTransferMenuAction->setText(i18n("Send Image via File Transfer"));
 		    d->fileResourceTransferMenu->addAction(d->shareImageMenuAction);
diff --git a/lib/chat-window-style-manager.cpp b/lib/chat-window-style-manager.cpp
index c63326c..ceae15e 100644
--- a/lib/chat-window-style-manager.cpp
+++ b/lib/chat-window-style-manager.cpp
@@ -25,6 +25,8 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QDir>
+#include <QMimeDatabase>
+#include <QMimeType>
 
 // KDE includes
 #include <KDirLister>
@@ -33,7 +35,6 @@
 #include <KArchive>
 #include <KZip>
 #include <KTar>
-#include <KMimeType>
 #include <KIO/NetAccess>
 #include <KSharedConfig>
 #include <KConfigGroup>
@@ -131,7 +132,8 @@ int ChatWindowStyleManager::installStyle(const QString &styleBundlePath)
     KArchiveDirectory *currentDir = 0L;
     KArchive *archive = 0L;
 
-    QString currentBundleMimeType = KMimeType::findByPath(styleBundlePath, 0, false)->name();
+    QMimeDatabase mimeDb;
+    QString currentBundleMimeType = db.mimeTypeForFile(styleBundlePath).name();
     if (currentBundleMimeType == QLatin1String("application/zip")) {
         archive = new KZip(styleBundlePath);
     } else if (currentBundleMimeType == QLatin1String("application/x-compressed-tar") ||

-- 
ktp-text-ui packaging