From 8119aafca4ded43d78e5a4373ff2c368660e4166 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 10 Aug 2017 18:44:50 +0200 Subject: [PATCH] Move URLs getter to cpp. This is a tweak so I can easily change the URLs for testing. --- src/blackcore/data/globalsetup.cpp | 15 +++++++++++++++ src/blackcore/data/globalsetup.h | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index d185dc921..3eb5bb1b6 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -179,6 +179,21 @@ namespace BlackCore return urls.appendPath(CGlobalSetup::versionString() + "/dbdata/"); } + const CUrlList &CGlobalSetup::getSwiftLatestNewsUrls() const + { + return m_newsUrls; + } + + const CUrlList &CGlobalSetup::getOnlineHelpUrls() const + { + return m_onlineHelpUrls; + } + + const CUrlList &CGlobalSetup::getSwiftMapUrls() const + { + return m_mapUrls; + } + CServerList CGlobalSetup::getFsdTestServersPlusHardcodedServers() const { static const CServerList hardcoded({ CServer("swift", "swift Testserver", "vatsim-germany.org", 6809, CUser("1234567", "swift Test User", "", "123456"), CServer::FSDServerVatsim, true) }); diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index cb40aa3db..4a85e5ffb 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -141,13 +141,13 @@ namespace BlackCore BlackMisc::Network::CUrlList getSwiftDbDataFileLocationUrls() const; //! Locations of swift DB news - const BlackMisc::Network::CUrlList &getSwiftLatestNewsUrls() const { return m_newsUrls; } + const BlackMisc::Network::CUrlList &getSwiftLatestNewsUrls() const; //! Online help URLs - const BlackMisc::Network::CUrlList &getOnlineHelpUrls() const { return m_onlineHelpUrls; } + const BlackMisc::Network::CUrlList &getOnlineHelpUrls() const; //! swift map URLs - const BlackMisc::Network::CUrlList &getSwiftMapUrls() const { return m_mapUrls; } + const BlackMisc::Network::CUrlList &getSwiftMapUrls() const; //! FSD test servers const BlackMisc::Network::CServerList &getFsdTestServers() const { return m_fsdTestServers; }