From 12957f8ec0452eb4ad195a53b4d5a02f09a8f769 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 26 Feb 2016 18:17:01 +0100 Subject: [PATCH] refs #602, remove QNetworkAccessManager from readers, use central one --- src/blackcore/data/globalsetup.h | 2 +- src/blackcore/vatsimbookingreader.cpp | 11 ++++------- src/blackcore/vatsimbookingreader.h | 1 - src/blackcore/vatsimdatafilereader.cpp | 15 ++++++--------- src/blackcore/vatsimdatafilereader.h | 3 --- src/blackcore/vatsimmetarreader.cpp | 11 ++++------- src/blackcore/vatsimmetarreader.h | 2 -- 7 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index aa0104805..1123306aa 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -150,7 +150,7 @@ namespace BlackCore BlackMisc::Network::CUrl m_dbRootDirectoryUrl; //!< Root directory of DB BlackMisc::Network::CUrl m_vatsimBookingsUrl; //!< ATC bookings BlackMisc::Network::CUrl m_vatsimMetarsUrl; //!< METAR data - BlackMisc::Network::CUrlList m_vatsimDataFileUrls; //!< Overall VATSIM data file + BlackMisc::Network::CUrlList m_vatsimDataFileUrls; //!< Overall VATSIM data file / merely for bootstrapping the first time BlackMisc::Network::CUrlList m_sharedUrls; //!< where we can obtain shared info files such as bootstrap, .. BlackMisc::Network::CUrlList m_newsUrls; //!< where we can obtain latest news BlackMisc::Network::CServerList m_fsdTestServers; //!< FSD test servers diff --git a/src/blackcore/vatsimbookingreader.cpp b/src/blackcore/vatsimbookingreader.cpp index f48383cee..a02a2660b 100644 --- a/src/blackcore/vatsimbookingreader.cpp +++ b/src/blackcore/vatsimbookingreader.cpp @@ -7,6 +7,7 @@ * contained in the LICENSE file. */ +#include "blackcore/application.h" #include "blackmisc/sequence.h" #include "blackmisc/aviation/atcstation.h" #include "blackmisc/network/user.h" @@ -25,8 +26,6 @@ namespace BlackCore CVatsimBookingReader::CVatsimBookingReader(QObject *owner) : CThreadedReader(owner, "CVatsimBookingReader") { - this->m_networkManager = new QNetworkAccessManager(this); - this->connect(this->m_networkManager, &QNetworkAccessManager::finished, this, &CVatsimBookingReader::ps_parseBookings); this->connect(this->m_updateTimer, &QTimer::timeout, this, &CVatsimBookingReader::ps_read); } @@ -39,19 +38,17 @@ namespace BlackCore void CVatsimBookingReader::cleanup() { - delete this->m_networkManager; - this->m_networkManager = nullptr; + // void } void CVatsimBookingReader::ps_read() { this->threadAssertCheck(); - Q_ASSERT_X(this->m_networkManager, Q_FUNC_INFO, "No network manager"); + Q_ASSERT_X(sApp, Q_FUNC_INFO, "No application"); QUrl url(m_setup.get().vatsimBookingsUrl()); if (url.isEmpty()) { return; } - QNetworkRequest request(url); - this->m_networkManager->get(request); + sApp->getFromNetwork(url, { this, &CVatsimBookingReader::ps_parseBookings}); } void CVatsimBookingReader::ps_parseBookings(QNetworkReply *nwReplyPtr) diff --git a/src/blackcore/vatsimbookingreader.h b/src/blackcore/vatsimbookingreader.h index 445e28ced..14cd2b79a 100644 --- a/src/blackcore/vatsimbookingreader.h +++ b/src/blackcore/vatsimbookingreader.h @@ -57,7 +57,6 @@ namespace BlackCore private: BlackMisc::CData m_setup {this}; //!< setup cache - QNetworkAccessManager *m_networkManager = nullptr; }; } diff --git a/src/blackcore/vatsimdatafilereader.cpp b/src/blackcore/vatsimdatafilereader.cpp index 96bcb664b..b9dc16ac9 100644 --- a/src/blackcore/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsimdatafilereader.cpp @@ -7,6 +7,8 @@ * contained in the LICENSE file. */ +#include "blackcore/vatsimdatafilereader.h" +#include "blackcore/application.h" #include "blackmisc/sequence.h" #include "blackmisc/aviation/atcstation.h" #include "blackmisc/network/user.h" @@ -14,8 +16,6 @@ #include "blackmisc/network/urllist.h" #include "blackmisc/network/entityflags.h" #include "blackmisc/logmessage.h" -#include "blackcore/vatsimdatafilereader.h" - #include using namespace BlackMisc; @@ -31,8 +31,6 @@ namespace BlackCore CVatsimDataFileReader::CVatsimDataFileReader(QObject *owner) : CThreadedReader(owner, "CVatsimDataFileReader") { - this->m_networkManager = new QNetworkAccessManager(this); - this->connect(this->m_networkManager, &QNetworkAccessManager::finished, this, &CVatsimDataFileReader::ps_parseVatsimFile); this->connect(this->m_updateTimer, &QTimer::timeout, this, &CVatsimDataFileReader::ps_read); } @@ -150,8 +148,7 @@ namespace BlackCore void CVatsimDataFileReader::cleanup() { - delete this->m_networkManager; - this->m_networkManager = nullptr; + // void } void CVatsimDataFileReader::ps_read() @@ -163,9 +160,9 @@ namespace BlackCore // see http://qt-project.org/doc/qt-4.7/qnetworkaccessmanager.html QUrl url(m_setup.get().vatsimDataFileUrls().getRandomUrl()); if (url.isEmpty()) { return; } - Q_ASSERT_X(this->m_networkManager, Q_FUNC_INFO, "Missing network manager"); - QNetworkRequest request(url); - this->m_networkManager->get(request); + Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing application"); + sApp->getFromNetwork(url, { this, &CVatsimDataFileReader::ps_parseVatsimFile}); + } void CVatsimDataFileReader::ps_parseVatsimFile(QNetworkReply *nwReplyPtr) diff --git a/src/blackcore/vatsimdatafilereader.h b/src/blackcore/vatsimdatafilereader.h index fb17862fb..0a67783c7 100644 --- a/src/blackcore/vatsimdatafilereader.h +++ b/src/blackcore/vatsimdatafilereader.h @@ -24,7 +24,6 @@ #include #include -#include #include namespace BlackCore @@ -124,7 +123,6 @@ namespace BlackCore void ps_read(); private: - QNetworkAccessManager *m_networkManager = nullptr; BlackMisc::Network::CServerList m_voiceServers; BlackMisc::Network::CServerList m_fsdServers; BlackMisc::Aviation::CAtcStationList m_atcStations; @@ -147,7 +145,6 @@ namespace BlackCore //! Get current section static Section currentLineToSection(const QString ¤tLine); - }; } // ns diff --git a/src/blackcore/vatsimmetarreader.cpp b/src/blackcore/vatsimmetarreader.cpp index 873a0c2da..340be5677 100644 --- a/src/blackcore/vatsimmetarreader.cpp +++ b/src/blackcore/vatsimmetarreader.cpp @@ -8,6 +8,7 @@ */ #include "blackcore/vatsimmetarreader.h" +#include "blackcore/application.h" #include "blackmisc/network/entityflags.h" #include "blackmisc/sequence.h" #include "blackmisc/logmessage.h" @@ -26,8 +27,6 @@ namespace BlackCore CVatsimMetarReader::CVatsimMetarReader(QObject *owner) : CThreadedReader(owner, "CVatsimMetarReader") { - this->m_networkManager = new QNetworkAccessManager(this); - this->connect(this->m_networkManager, &QNetworkAccessManager::finished, this, &CVatsimMetarReader::ps_decodeMetars); this->connect(this->m_updateTimer, &QTimer::timeout, this, &CVatsimMetarReader::ps_readMetars); } @@ -58,8 +57,7 @@ namespace BlackCore void CVatsimMetarReader::cleanup() { - delete this->m_networkManager; - this->m_networkManager = nullptr; + // void } void CVatsimMetarReader::ps_readMetars() @@ -67,9 +65,8 @@ namespace BlackCore this->threadAssertCheck(); QUrl url(m_setup.get().vatsimMetarsUrl()); if (url.isEmpty()) { return; } - Q_ASSERT_X(this->m_networkManager, Q_FUNC_INFO, "No network manager"); - QNetworkRequest request(url); - this->m_networkManager->get(request); + Q_ASSERT_X(sApp, Q_FUNC_INFO, "No Application"); + sApp->getFromNetwork(url, { this, &CVatsimMetarReader::ps_decodeMetars}); } void CVatsimMetarReader::ps_decodeMetars(QNetworkReply *nwReplyPtr) diff --git a/src/blackcore/vatsimmetarreader.h b/src/blackcore/vatsimmetarreader.h index 8ea35c618..8115996ff 100644 --- a/src/blackcore/vatsimmetarreader.h +++ b/src/blackcore/vatsimmetarreader.h @@ -20,7 +20,6 @@ #include #include -#include #include namespace BlackCore @@ -69,7 +68,6 @@ namespace BlackCore void ps_readMetars(); private: - QNetworkAccessManager *m_networkManager = nullptr; BlackMisc::Weather::CMetarDecoder m_metarDecoder; BlackMisc::Weather::CMetarSet m_metars; BlackMisc::CData m_setup {this}; //!< setup cache