[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=4ab8fc8

The following commit has been merged in the master branch:
commit 4ab8fc8a1685857fdea52d050d617ea5c23dba1a
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Dec 5 16:12:47 2014 +0100

    Port MPForm away from kdelibs4support
---
 image-sharer/mpform.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/image-sharer/mpform.cpp b/image-sharer/mpform.cpp
index 7ec3370..7fb046d 100644
--- a/image-sharer/mpform.cpp
+++ b/image-sharer/mpform.cpp
@@ -32,12 +32,12 @@
 // Qt includes
 
 #include <QFile>
+#include <QUrl>
+#include <QFileInfo>
+#include <QMimeDatabase>
 
 // KDE includes
 
-#include <kapplication.h>
-#include <kmimetype.h>
-#include <kurl.h>
 #include <krandom.h>
 
 
@@ -102,8 +102,9 @@ bool MPForm::addPair(const QString& name, const QString& value, const QString& c
 
 bool MPForm::addFile(const QString& name, const QString& path)
 {
-    KMimeType::Ptr ptr = KMimeType::findByUrl(path);
-    QString mime       = ptr->name();
+    QMimeDatabase db;
+    QMimeType ptr = db.mimeTypeForUrl(QUrl::fromLocalFile(path));
+    QString mime  = ptr.name();
 
     if (mime.isEmpty())
     {
@@ -132,7 +133,7 @@ bool MPForm::addFile(const QString& name, const QString& path)
     str += name.toAscii();
     str += "\"; ";
     str += "filename=\"";
-    str += QFile::encodeName(KUrl(path).fileName());
+    str += QFile::encodeName(imageFile.fileName());
     str += "\"
";
     str += "Content-Length: ";
     str += file_size.toAscii();
@@ -151,8 +152,9 @@ bool MPForm::addFile(const QString& name, const QString& path)
 
 bool MPForm::addFile(const QString& name, const QString& filePath, const QByteArray& fileData)
 {
-    KMimeType::Ptr ptr = KMimeType::findByUrl(filePath);
-    QString mime       = ptr->name();
+    QMimeDatabase db;
+    QMimeType ptr = db.mimeTypeForUrl(QUrl::fromLocalFile(filePath));
+    QString mime  = ptr.name();
 
     if (mime.isEmpty())
     {
@@ -171,7 +173,7 @@ bool MPForm::addFile(const QString& name, const QString& filePath, const QByteAr
     str += name.toAscii();
     str += "\"; ";
     str += "filename=\"";
-    str += QFile::encodeName(KUrl(filePath).fileName());
+    str += QFile::encodeName(QFileInfo(filePath).fileName());
     str += "\"
";
     str += "Content-Length: ";
     str += file_size.toAscii();

-- 
ktp-text-ui packaging