From 6ebbf58f79cdad6b1d1b8c18d2737665072b3bdd Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 27 Apr 2017 20:56:12 +0200 Subject: [PATCH] Formatting --- src/blackcore/application.cpp | 2 +- src/blackcore/application.h | 2 +- src/blackcore/modelsetbuilder.cpp | 2 +- src/blackgui/settings/atcstationssettings.cpp | 4 +--- src/plugins/weatherdata/gfs/weatherdatagfs.h | 7 +++---- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 069a8cf4c..b7416d162 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -1229,7 +1229,7 @@ namespace BlackCore { // Called when finished! // QNetworkRequest::FollowRedirectsAttribute would allow auto redirect, but we use our approach as it gives us better control - // \fixme: Check again on Qt 5.9: Added redirects policy to QNetworkAccessManager (ManulRedirectsPolicy, NoLessSafeRedirectsPolicy, SameOriginRedirectsPolicy, UserVerifiedRedirectsPolicy) + // \fixme: Check again on Qt 5.9: Added redirects policy to QNetworkAccessManager (ManualRedirectsPolicy, NoLessSafeRedirectsPolicy, SameOriginRedirectsPolicy, UserVerifiedRedirectsPolicy) const bool isRedirect = CNetworkUtils::isHttpStatusRedirect(reply); if (isRedirect && maxRedirects > 0) { diff --git a/src/blackcore/application.h b/src/blackcore/application.h index ffe6ad2f3..048e4dacf 100644 --- a/src/blackcore/application.h +++ b/src/blackcore/application.h @@ -153,7 +153,7 @@ namespace BlackCore //! \threadsafe BlackMisc::Db::CDistributionList getDistributionInfo() const; - //! Delete all cookies from cookier manager + //! Delete all cookies from cookie manager void deleteAllCookies(); //! Network accessible? diff --git a/src/blackcore/modelsetbuilder.cpp b/src/blackcore/modelsetbuilder.cpp index 6810ba7ea..b086b345e 100644 --- a/src/blackcore/modelsetbuilder.cpp +++ b/src/blackcore/modelsetbuilder.cpp @@ -10,7 +10,7 @@ #include "application.h" #include "modelsetbuilder.h" #include "webdataservices.h" -#include "db/databaseutils.h" +#include "blackcore/db/databaseutils.h" #include "blackmisc/aviation/aircrafticaocodelist.h" #include "blackmisc/simulation/aircraftmodel.h" diff --git a/src/blackgui/settings/atcstationssettings.cpp b/src/blackgui/settings/atcstationssettings.cpp index fa362745e..cb92ad7db 100644 --- a/src/blackgui/settings/atcstationssettings.cpp +++ b/src/blackgui/settings/atcstationssettings.cpp @@ -22,9 +22,7 @@ namespace BlackGui { Q_UNUSED(i18n); static const QString s("In range only: %1"); - return s.arg( - boolToOnOff(this->showOnlyInRange()) - ); + return s.arg(boolToOnOff(this->showOnlyInRange())); } CVariant CAtcStationsSettings::propertyByIndex(const CPropertyIndex &index) const diff --git a/src/plugins/weatherdata/gfs/weatherdatagfs.h b/src/plugins/weatherdata/gfs/weatherdatagfs.h index ae522fb72..f35359c2a 100644 --- a/src/plugins/weatherdata/gfs/weatherdatagfs.h +++ b/src/plugins/weatherdata/gfs/weatherdatagfs.h @@ -22,13 +22,11 @@ #include #include #include +#include #include #include -class QNetworkAccessManager; - namespace BlackMisc { namespace PhysicalQuantities { class CTemperature; }} - namespace BlackWxPlugin { namespace Gfs @@ -45,7 +43,7 @@ namespace BlackWxPlugin CWeatherDataGfs(QObject *parent = nullptr); //! Destructor - ~CWeatherDataGfs(); + virtual ~CWeatherDataGfs(); //! \copydoc BlackCore::IWeatherData::fetchWeatherData virtual void fetchWeatherData(const BlackMisc::Weather::CWeatherGrid &grid, @@ -59,6 +57,7 @@ namespace BlackWxPlugin //! \threadsafe void ps_fetchingWeatherDataFinished(); + //! Parsing void ps_parseGfsFile(QNetworkReply *reply); private: