From 7edd1bb6213a6627766b657dfa294c0e8d578ab2 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Tue, 24 Jan 2017 14:13:36 +0100 Subject: [PATCH] Rename CThreadedReader::isNetworkConnectedAndAccessible() for consistency refs #869 --- src/blackcore/db/airportdatareader.cpp | 2 +- src/blackcore/db/databasereader.cpp | 4 ++-- src/blackcore/db/icaodatareader.cpp | 2 +- src/blackcore/db/modeldatareader.cpp | 2 +- src/blackcore/threadedreader.cpp | 2 +- src/blackcore/threadedreader.h | 4 ++-- src/blackcore/vatsim/vatsimbookingreader.cpp | 2 +- src/blackcore/vatsim/vatsimdatafilereader.cpp | 2 +- src/blackcore/vatsim/vatsimmetarreader.cpp | 2 +- src/blackcore/vatsim/vatsimstatusfilereader.cpp | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/blackcore/db/airportdatareader.cpp b/src/blackcore/db/airportdatareader.cpp index cfdb6f89d..c916a8657 100644 --- a/src/blackcore/db/airportdatareader.cpp +++ b/src/blackcore/db/airportdatareader.cpp @@ -182,7 +182,7 @@ namespace BlackCore this->threadAssertCheck(); if (this->isShuttingDown()) { return; } entity &= CEntityFlags::AirportEntity; - if (!this->isNetworkConnectedAndAccessible()) + if (!this->isNetworkAccessible()) { emit this->dataRead(entity, CEntityFlags::ReadSkipped, 0); return; diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index 59c0d72d0..f8b03f67f 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -167,7 +167,7 @@ namespace BlackCore // ps_read is implemented in the derived classes if (entities == CEntityFlags::NoEntity) { return; } - if (!this->isNetworkConnectedAndAccessible()) + if (!this->isNetworkAccessible()) { CLogMessage(this).warning("No network, will not read %1") << CEntityFlags::flagToString(entities); return; @@ -318,7 +318,7 @@ namespace BlackCore bool CDatabaseReader::requestHeadersOfSharedFiles(const CEntityFlags::Entity &entities) { - if (!this->isNetworkConnectedAndAccessible()) + if (!this->isNetworkAccessible()) { CLogMessage(this).warning("No network, will not read shared file headers for %1") << CEntityFlags::flagToString(entities); return false; diff --git a/src/blackcore/db/icaodatareader.cpp b/src/blackcore/db/icaodatareader.cpp index 02247244c..f7074af6e 100644 --- a/src/blackcore/db/icaodatareader.cpp +++ b/src/blackcore/db/icaodatareader.cpp @@ -133,7 +133,7 @@ namespace BlackCore this->threadAssertCheck(); // runs in background thread if (this->isShuttingDown()) { return; } entities &= CEntityFlags::AllIcaoAndCountries; - if (!this->isNetworkConnectedAndAccessible()) + if (!this->isNetworkAccessible()) { emit this->dataRead(entities, CEntityFlags::ReadSkipped, 0); return; diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp index ddf6aebca..595c507d9 100644 --- a/src/blackcore/db/modeldatareader.cpp +++ b/src/blackcore/db/modeldatareader.cpp @@ -152,7 +152,7 @@ namespace BlackCore this->threadAssertCheck(); if (this->isShuttingDown()) { return; } entities &= CEntityFlags::DistributorLiveryModel; - if (!this->isNetworkConnectedAndAccessible()) + if (!this->isNetworkAccessible()) { emit this->dataRead(entities, CEntityFlags::ReadSkipped, 0); return; diff --git a/src/blackcore/threadedreader.cpp b/src/blackcore/threadedreader.cpp index 4b7f77780..117557579 100644 --- a/src/blackcore/threadedreader.cpp +++ b/src/blackcore/threadedreader.cpp @@ -69,7 +69,7 @@ namespace BlackCore return delta <= timeLastMs; } - bool CThreadedReader::isNetworkConnectedAndAccessible() const + bool CThreadedReader::isNetworkAccessible() const { return sApp->isNetworkAccessible(); } diff --git a/src/blackcore/threadedreader.h b/src/blackcore/threadedreader.h index d4766f57c..df755c1c1 100644 --- a/src/blackcore/threadedreader.h +++ b/src/blackcore/threadedreader.h @@ -52,8 +52,8 @@ namespace BlackCore //! \threadsafe bool updatedWithinLastMs(qint64 timeLastMs); - //! Network available - bool isNetworkConnectedAndAccessible() const; + //! Network accessable? + bool isNetworkAccessible() const; //! Is marked as read failed //! \threadsafe diff --git a/src/blackcore/vatsim/vatsimbookingreader.cpp b/src/blackcore/vatsim/vatsimbookingreader.cpp index 20c77f7a4..336590fd8 100644 --- a/src/blackcore/vatsim/vatsimbookingreader.cpp +++ b/src/blackcore/vatsim/vatsimbookingreader.cpp @@ -67,7 +67,7 @@ namespace BlackCore void CVatsimBookingReader::ps_read() { - if (!this->isNetworkConnectedAndAccessible()) + if (!this->isNetworkAccessible()) { CLogMessage(this).warning("No network, cannot read VATSIM bookings"); return; diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp index 1cdf5831d..d66fb15b3 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp @@ -185,7 +185,7 @@ namespace BlackCore void CVatsimDataFileReader::ps_read() { - if (!this->isNetworkConnectedAndAccessible()) + if (!this->isNetworkAccessible()) { CLogMessage(this).warning("No network, cannot read VATSIM data file"); return; diff --git a/src/blackcore/vatsim/vatsimmetarreader.cpp b/src/blackcore/vatsim/vatsimmetarreader.cpp index b4b5cde65..5e6cf677a 100644 --- a/src/blackcore/vatsim/vatsimmetarreader.cpp +++ b/src/blackcore/vatsim/vatsimmetarreader.cpp @@ -80,7 +80,7 @@ namespace BlackCore void CVatsimMetarReader::readMetars() { if (this->isAbandoned()) { return; } - if (!this->isNetworkConnectedAndAccessible()) + if (!this->isNetworkAccessible()) { CLogMessage(this).warning("No network, cannot read METARs"); return; diff --git a/src/blackcore/vatsim/vatsimstatusfilereader.cpp b/src/blackcore/vatsim/vatsimstatusfilereader.cpp index cfac88f99..3d4bf3be9 100644 --- a/src/blackcore/vatsim/vatsimstatusfilereader.cpp +++ b/src/blackcore/vatsim/vatsimstatusfilereader.cpp @@ -71,7 +71,7 @@ namespace BlackCore void CVatsimStatusFileReader::ps_read() { this->threadAssertCheck(); - if (!this->isNetworkConnectedAndAccessible()) { return; } + if (!this->isNetworkAccessible()) { return; } Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing application"); CFailoverUrlList urls(sApp->getGlobalSetup().getVatsimStatusFileUrls());