From 9aabd5db0439e207920ee599e77f91ff6ae7cf5e Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Thu, 3 Oct 2019 19:10:42 +0100 Subject: [PATCH] [FSD] Superfluous parentheses --- src/blackcore/data/globalsetup.cpp | 20 ++++++++++---------- src/blackmisc/network/url.cpp | 4 ++++ src/blackmisc/network/url.h | 3 +++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index 61169a4ee..7d73ccc14 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -47,28 +47,28 @@ namespace BlackCore m_mappingMinimumVersion = CBuildConfig::getVersionString(); m_dbRootDirectoryUrl = CUrl("https://datastore.swift-project.org/"); m_vatsimBookingsUrl = CUrl("http://vatbook.euroutepro.com/xml2.php"); - m_vatsimMetarsUrls = CUrlList({"http://metar.vatsim.net/metar.php"}); - m_vatsimStatusFileUrls = CUrlList({ "https://status.vatsim.net" }); - m_vatsimDataFileUrls = CUrlList({ "http://info.vroute.net/vatsim-data.txt" }); - m_sharedUrls = CUrlList( + m_vatsimMetarsUrls = CUrlList{"http://metar.vatsim.net/metar.php"}; + m_vatsimStatusFileUrls = CUrlList{ "https://status.vatsim.net" }; + m_vatsimDataFileUrls = CUrlList{ "http://info.vroute.net/vatsim-data.txt" }; + m_sharedUrls = CUrlList { "https://datastore.swift-project.net/shared/", "http://www.siliconmind.de/datastore/shared/", "http://download.swift-project.org/shared/", "https://swift.fir-berlin.de/shared" - }); + }; - m_newsUrls = CUrlList( + m_newsUrls = CUrlList { "https://blog.swift-project.net/?__print__=1", "https://dev.swift-project.org/phame/blog/view/1/?__print__=1" - }); - m_onlineHelpUrls = CUrlList( + }; + m_onlineHelpUrls = CUrlList { "https://datastore.swift-project.org/page/swifthelpdispatcher.html", "https://datastore.swift-project.net/page/swifthelpdispatcher.html" - }); - m_mapUrls = CUrlList({ "map.swift-project.org/" }); + }; + m_mapUrls = CUrlList{ "map.swift-project.org/" }; m_ncepGlobalForecastSystemUrl = CUrl("http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_0p50.pl"); m_ncepGlobalForecastSystemUrl25 = CUrl("http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_0p25.pl"); diff --git a/src/blackmisc/network/url.cpp b/src/blackmisc/network/url.cpp index 0de71b9d2..2b6a25473 100644 --- a/src/blackmisc/network/url.cpp +++ b/src/blackmisc/network/url.cpp @@ -26,6 +26,10 @@ namespace BlackMisc } } + CUrl::CUrl(const char *url) : + CUrl(QString(url)) + { } + CUrl::CUrl(const QUrl &url) { this->setQUrl(url); diff --git a/src/blackmisc/network/url.h b/src/blackmisc/network/url.h index b99fa682a..243347764 100644 --- a/src/blackmisc/network/url.h +++ b/src/blackmisc/network/url.h @@ -45,6 +45,9 @@ namespace BlackMisc //! Default constructor. CUrl(const QString &fullUrl = QString()); + //! Construct from character array. + CUrl(const char *url); + //! By QUrl. CUrl(const QUrl &url);