[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=3107404

The following commit has been merged in the master branch:
commit 31074046a3e02f77917795aa915d91213acdfc68
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Dec 5 19:07:45 2014 +0100

    Make it possible to add remote files to MPForm
    
    With the MPForm::addFile that passes the payload as an argument, we don't
    really care about the file location, therefore we can accept any Url,
    including local files (using QUrl::fromLocalFile).
---
 image-sharer/mpform.cpp | 4 ++--
 image-sharer/mpform.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/image-sharer/mpform.cpp b/image-sharer/mpform.cpp
index 61c8399..8558bbf 100644
--- a/image-sharer/mpform.cpp
+++ b/image-sharer/mpform.cpp
@@ -147,10 +147,10 @@ bool MPForm::addFile(const QString& name, const QString& path)
     return true;
 }
 
-bool MPForm::addFile(const QString& name, const QString& filePath, const QByteArray& fileData)
+bool MPForm::addFile(const QString& name, const QUrl& fileUrl, const QByteArray& fileData)
 {
     QMimeDatabase db;
-    QMimeType ptr = db.mimeTypeForUrl(QUrl::fromLocalFile(filePath));
+    QMimeType ptr = db.mimeTypeForUrl(fileUrl);
     QString mime  = ptr.name();
 
     if (mime.isEmpty())
diff --git a/image-sharer/mpform.h b/image-sharer/mpform.h
index de019b8..02706b3 100644
--- a/image-sharer/mpform.h
+++ b/image-sharer/mpform.h
@@ -28,7 +28,7 @@
 // Qt includes
 
 #include <QByteArray>
-#include <QString>
+#include <QUrl>
 
 class MPForm
 {
@@ -43,7 +43,7 @@ public:
 
     bool addPair(const QString& name, const QString& value, const QString& type);
     bool addFile(const QString& name, const QString& path);
-    bool addFile(const QString& name, const QString& filePath, const QByteArray& fileData);
+    bool addFile(const QString& name, const QUrl& filePath, const QByteArray& fileData);
 
     QByteArray contentType() const;
     QByteArray formData()    const;

-- 
ktp-text-ui packaging