From 959d7c89a97cc3ed22054ae6d52a0f7d77e6be0d Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Sun, 22 Feb 2015 11:59:22 +0100
Subject: [PATCH] Port utils.cpp away from deprecated Qt API

---
 src/libdanbooru/utils.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/libdanbooru/utils.cpp b/src/libdanbooru/utils.cpp
index 7bbc0e5..6ed6a05 100644
--- a/src/libdanbooru/utils.cpp
+++ b/src/libdanbooru/utils.cpp
@@ -26,6 +26,7 @@
 
 #include <QJsonDocument>
 #include <QXmlStreamReader>
+#include <QUrlQuery>
 
 // KDE
 
@@ -45,10 +46,12 @@ QUrl requestUrl(QUrl &url, const QString &path,
 
     // If we have parameters, add them
 
+    QUrlQuery query;
+
     if (!parameters.isEmpty()) {
 
         for (auto key : parameters.keys()) {
-            danbooruUrl.addQueryItem(key, parameters.value(key));
+            query.addQueryItem(key, parameters.value(key));
         }
 
     }
@@ -56,15 +59,17 @@ QUrl requestUrl(QUrl &url, const QString &path,
     // Now, let's add tags should we have them
 
     if (!tags.isEmpty()) {
-        QByteArray encoded_tags = QUrl::toPercentEncoding(tags.join(" "));
-        danbooruUrl.addEncodedQueryItem("tags", encoded_tags);
+        query.addQueryItem("tags", tags.join(" "));
     }
 
+    danbooruUrl.setQuery(query);
+
     if (!username.isEmpty() && !password.isEmpty()) {
         danbooruUrl.setUserName(username);
         danbooruUrl.setPassword(password);
     }
 
+
     return danbooruUrl;
 }
 
@@ -78,14 +83,18 @@ QUrl requestUrl(QUrl &url, const QString &path, const QString &username,
 
     // If we have parameters, add them
 
+    QUrlQuery query;
+
     if (!parameters.isEmpty()) {
 
         for (auto key : parameters.keys()) {
-            danbooruUrl.addQueryItem(key, parameters.value(key));
+            query.addQueryItem(key, parameters.value(key));
         }
 
     }
 
+    danbooruUrl.setQuery(query);
+
     if (!username.isEmpty() && !password.isEmpty()) {
         danbooruUrl.setUserName(username);
         danbooruUrl.setPassword(password);