X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fupdatechecker.cpp;h=07b333580b143a9d8197d99df15f4a431f605841;hb=refs%2Ftags%2Fupstream%2F2.9;hp=0c8ac286c4f61478c6efd2523d83c840c325d899;hpb=994e6e5e95196b0e36c680b1fd496f12d71739c9;p=minitube diff --git a/src/updatechecker.cpp b/src/updatechecker.cpp index 0c8ac28..07b3335 100644 --- a/src/updatechecker.cpp +++ b/src/updatechecker.cpp @@ -19,16 +19,12 @@ along with Minitube. If not, see . $END_LICENSE */ #include "updatechecker.h" -#include "networkaccess.h" +#include "http.h" +#include "httputils.h" #include "constants.h" #ifdef APP_ACTIVATION #include "activation.h" #endif -#include "compatibility/qurlqueryhelper.h" - -namespace The { -NetworkAccess* http(); -} UpdateChecker::UpdateChecker() { m_needUpdate = false; @@ -36,30 +32,26 @@ UpdateChecker::UpdateChecker() { void UpdateChecker::checkForUpdate() { QUrl url(QLatin1String(Constants::WEBSITE) + "-ws/release.xml"); - - { - QUrlQueryHelper urlHelper(url); - urlHelper.addQueryItem("v", Constants::VERSION); - + QUrlQuery q; + q.addQueryItem("v", Constants::VERSION); #ifdef APP_MAC - urlHelper.addQueryItem("os", "mac"); + q.addQueryItem("os", "mac"); #endif #ifdef APP_WIN - urlHelper.addQueryItem("os", "win"); + q.addQueryItem("os", "win"); #endif #ifdef APP_ACTIVATION - QString t = "demo"; - if (Activation::instance().isActivated()) t = "active"; - urlHelper.addQueryItem("t", t); + QString t = "demo"; + if (Activation::instance().isActivated()) t = "active"; + q.addQueryItem("t", t); #endif #ifdef APP_MAC_STORE - urlHelper.addQueryItem("store", "mac"); + q.addQueryItem("store", "mac"); #endif - } + url.setQuery(q); - QObject *reply = The::http()->get(url); + QObject *reply = HttpUtils::notCached().get(url); connect(reply, SIGNAL(data(QByteArray)), SLOT(requestFinished(QByteArray))); - } void UpdateChecker::requestFinished(QByteArray data) {