Updater: use QUrlQuery

QUrl::addQueryItem is deprecated
This commit is contained in:
Olivier Goffart 2017-12-08 11:10:22 +01:00
parent 1a503d54f6
commit a4816d6a8c

View File

@ -41,7 +41,7 @@ Updater *Updater::instance()
QUrl Updater::addQueryParams(const QUrl &url)
{
QUrl paramUrl = url;
QUrlQuery query;
Theme *theme = Theme::instance();
QString platform = QLatin1String("stranger");
if (Utility::isLinux()) {
@ -56,23 +56,25 @@ QUrl Updater::addQueryParams(const QUrl &url)
QString sysInfo = getSystemInfo();
if (!sysInfo.isEmpty()) {
paramUrl.addQueryItem(QLatin1String("client"), sysInfo);
query.addQueryItem(QLatin1String("client"), sysInfo);
}
paramUrl.addQueryItem(QLatin1String("version"), clientVersion());
paramUrl.addQueryItem(QLatin1String("platform"), platform);
paramUrl.addQueryItem(QLatin1String("oem"), theme->appName());
query.addQueryItem(QLatin1String("version"), clientVersion());
query.addQueryItem(QLatin1String("platform"), platform);
query.addQueryItem(QLatin1String("oem"), theme->appName());
QString suffix = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
paramUrl.addQueryItem(QLatin1String("versionsuffix"), suffix);
query.addQueryItem(QLatin1String("versionsuffix"), suffix);
if (suffix.startsWith("nightly")
|| suffix.startsWith("alpha")
|| suffix.startsWith("rc")
|| suffix.startsWith("beta")) {
paramUrl.addQueryItem(QLatin1String("channel"), "beta");
query.addQueryItem(QLatin1String("channel"), "beta");
// FIXME: Provide a checkbox in UI to enable regular versions to switch
// to beta channel
}
QUrl paramUrl = url;
paramUrl.setQuery(query);
return paramUrl;
}