flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 00:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename CThreadedReader::isNetworkConnectedAndAccessible() for consistency

Browse Source 
refs #869
This commit is contained in:
Roland Winklmeier
2017-01-24 14:13:36 +01:00
committed by Mathew Sutcliffe
parent 64a47da67f
commit 7edd1bb621
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/db/airportdatareader.cpp
View File

@@ -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;

4
src/blackcore/db/databasereader.cpp
View File

@@ -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;

2
src/blackcore/db/icaodatareader.cpp
View File

@@ -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;

2
src/blackcore/db/modeldatareader.cpp
View File

@@ -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;

2
src/blackcore/threadedreader.cpp
View File

@@ -69,7 +69,7 @@ namespace BlackCore
return delta <= timeLastMs;
}
bool CThreadedReader::isNetworkConnectedAndAccessible() const
bool CThreadedReader::isNetworkAccessible() const
{
return sApp->isNetworkAccessible();
}

4
src/blackcore/threadedreader.h
View File

@@ -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

2
src/blackcore/vatsim/vatsimbookingreader.cpp
View File

@@ -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;

2
src/blackcore/vatsim/vatsimdatafilereader.cpp
View File

@@ -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;

2
src/blackcore/vatsim/vatsimmetarreader.cpp
View File

@@ -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;

2
src/blackcore/vatsim/vatsimstatusfilereader.cpp
View File

@@ -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());