Fix updating QUrl query parameters with Qt5.

[minitube] / src / updatechecker.cpp

diff --git a/src/updatechecker.cpp b/src/updatechecker.cpp
index af7c349e6d3c9522cb00e669a40e8c946b1fc0cd..0c8ac286c4f61478c6efd2523d83c840c325d899 100644 (file)
--- a/src/updatechecker.cpp
+++ b/src/updatechecker.cpp
@@ -24,9 +24,10 @@ $END_LICENSE */
 #ifdef APP_ACTIVATION
 #include "activation.h"
 #endif
+#include "compatibility/qurlqueryhelper.h"
 
 namespace The {
-    NetworkAccess* http();
+NetworkAccess* http();
 }
 
 UpdateChecker::UpdateChecker() {
@@ -34,35 +35,39 @@ UpdateChecker::UpdateChecker() {
 }
 
 void UpdateChecker::checkForUpdate() {
-    QUrl updateUrl(QLatin1String(Constants::WEBSITE) + "-ws/release.xml");
-    updateUrl.addQueryItem("v", Constants::VERSION);
+    QUrl url(QLatin1String(Constants::WEBSITE) + "-ws/release.xml");
+
+    {
+        QUrlQueryHelper urlHelper(url);
+        urlHelper.addQueryItem("v", Constants::VERSION);
 
 #ifdef APP_MAC
-    updateUrl.addQueryItem("os", "mac");
+        urlHelper.addQueryItem("os", "mac");
 #endif
 #ifdef APP_WIN
-    updateUrl.addQueryItem("os", "win");
+        urlHelper.addQueryItem("os", "win");
 #endif
 #ifdef APP_ACTIVATION
-    QString t = "demo";
-    if (Activation::instance().isActivated()) t = "active";
-    updateUrl.addQueryItem("t", t);
+        QString t = "demo";
+        if (Activation::instance().isActivated()) t = "active";
+        urlHelper.addQueryItem("t", t);
 #endif
 #ifdef APP_MAC_STORE
-    updateUrl.addQueryItem("store", "mac");
+        urlHelper.addQueryItem("store", "mac");
 #endif
+    }
 
-    QObject *reply = The::http()->get(updateUrl);
+    QObject *reply = The::http()->get(url);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(requestFinished(QByteArray)));
 
 }
 
 void UpdateChecker::requestFinished(QByteArray data) {
-        UpdateCheckerStreamReader reader;
-        reader.read(data);
-        m_needUpdate = reader.needUpdate();
-        m_remoteVersion = reader.remoteVersion();
-        if (m_needUpdate && !m_remoteVersion.isEmpty()) emit newVersion(m_remoteVersion);
+    UpdateCheckerStreamReader reader;
+    reader.read(data);
+    m_needUpdate = reader.needUpdate();
+    m_remoteVersion = reader.remoteVersion();
+    if (m_needUpdate && !m_remoteVersion.isEmpty()) emit newVersion(m_remoteVersion);
 }
 
 QString UpdateChecker::remoteVersion() {