From d9409c25f4df059b712459666b966959f6008744 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 5 Apr 2016 00:24:37 +0300 Subject: [PATCH] Preparing to prerelease * apply clangformat * fix yahoo weather api --- sources/awesome-widget/plugin/awupdatehelper.cpp | 10 ++++++---- sources/awesomewidgets/extweather.h | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp index 946f13d..3698602 100644 --- a/sources/awesome-widget/plugin/awupdatehelper.cpp +++ b/sources/awesome-widget/plugin/awupdatehelper.cpp @@ -69,8 +69,8 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway) bool AWUpdateHelper::checkVersion() { QSettings settings(m_genericConfig, QSettings::IniFormat); - QVersionNumber version - = QVersionNumber::fromString(settings.value(QString("Version"), QString(VERSION)).toString()); + QVersionNumber version = QVersionNumber::fromString( + settings.value(QString("Version"), QString(VERSION)).toString()); // update version settings.setValue(QString("Version"), QString(VERSION)); settings.sync(); @@ -94,7 +94,8 @@ void AWUpdateHelper::showInfo(const QVersionNumber version) { qCDebug(LOG_AW) << "Version" << version; - QString text = i18n("You are using the actual version %1", version.toString()); + QString text + = i18n("You are using the actual version %1", version.toString()); if (!QString(COMMIT_SHA).isEmpty()) text += QString(" (%1)").arg(QString(COMMIT_SHA)); return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok) @@ -127,7 +128,8 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button) switch (ret) { case QMessageBox::Ok: - QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion.toString()); + QDesktopServices::openUrl(QString(RELEASES) + + m_foundVersion.toString()); break; case QMessageBox::Cancel: default: diff --git a/sources/awesomewidgets/extweather.h b/sources/awesomewidgets/extweather.h index eafac3e..e0f1863 100644 --- a/sources/awesomewidgets/extweather.h +++ b/sources/awesomewidgets/extweather.h @@ -23,9 +23,9 @@ #include "abstractextitem.h" #define YAHOO_WEATHER_URL \ - "https://query.yahooapis.com/v1/public/yql?format=json&q=select * from " \ - "weather.forecast where u='c' and woeid in (select woeid from " \ - "geo.places(1) where text='%1, %2')" + "https://query.yahooapis.com/v1/public/yql?format=json&env=store://" \ + "datatables.org/alltableswithkeys&q=select * from weather.forecast where " \ + "u='c' and woeid in (select woeid from geo.places(1) where text='%1, %2')" namespace Ui