Merge tag 'upstream/2.5.1'

[minitube] / src / yt3.cpp

diff --git a/src/yt3.cpp b/src/yt3.cpp
index c341310b644b260b5261b86a193001d73334e423..b42e204a03c6e2cd1444d41c36e1515935cc27f0 100644 (file)
--- a/src/yt3.cpp
+++ b/src/yt3.cpp
@@ -6,6 +6,7 @@
 #include "jsfunctions.h"
 #include "networkaccess.h"
 #include "constants.h"
+#include "compatibility/qurlqueryhelper.h"
 
 #ifdef APP_EXTRA
 #include "extra.h"
@@ -54,7 +55,7 @@ YT3::YT3() {
         qWarning() << "No available API keys";
     } else {
         key = keys.takeFirst();
-        testApiKey();
+        if (!keys.isEmpty()) testApiKey();
     }
 }
 
@@ -65,18 +66,12 @@ const QString &YT3::baseUrl() {
 
 void YT3::testApiKey() {
     QUrl url = method("videos");
-#if QT_VERSION >= 0x050000
     {
-        QUrl &u = url;
-        QUrlQuery url;
-#endif
-        url.addQueryItem("part", "id");
-        url.addQueryItem("chart", "mostPopular");
-        url.addQueryItem("maxResults", "1");
-#if QT_VERSION >= 0x050000
-        u.setQuery(url);
+        QUrlQueryHelper urlHelper(url);
+        urlHelper.addQueryItem("part", "id");
+        urlHelper.addQueryItem("chart", "mostPopular");
+        urlHelper.addQueryItem("maxResults", "1");
     }
-#endif
     QObject *reply = The::http()->get(url);
     connect(reply, SIGNAL(finished(QNetworkReply*)), SLOT(testResponse(QNetworkReply*)));
 }
@@ -86,16 +81,9 @@ void YT3::addApiKey(QUrl &url) {
         qDebug() << __PRETTY_FUNCTION__ << "empty key";
         return;
     }
-#if QT_VERSION >= 0x050000
-    {
-        QUrl &u = url;
-        QUrlQuery url(u);
-#endif
-        url.addQueryItem("key", key);
-#if QT_VERSION >= 0x050000
-        u.setQuery(url);
-    }
-#endif
+
+    QUrlQueryHelper urlHelper(url);
+    urlHelper.addQueryItem("key", key);
 }
 
 QUrl YT3::method(const QString &name) {