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

Ref T125, renaming areAllDataRead => areAllInfoObjectsRead

Browse Source
This commit is contained in:
Klaus Basan
2017-08-15 02:13:31 +02:00
committed by Mathew Sutcliffe
parent 53189eafd5
commit 12db652ccf
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ namespace BlackCore
return m_infoObjects.size(); return m_infoObjects.size();
} }
bool CInfoDataReader::areAllDataRead() const bool CInfoDataReader::areAllInfoObjectsRead() const
{ {
return getInfoObjectCount() > 4; return getInfoObjectCount() > 4;
} }

2
src/blackcore/db/infodatareader.h
View File

@@ -45,7 +45,7 @@ namespace BlackCore
//! All data read? //! All data read?
//! \threadsafe //! \threadsafe
bool areAllDataRead() const; bool areAllInfoObjectsRead() const;
//! Allow to call directly, special for info objects reader //! Allow to call directly, special for info objects reader
void read(); void read();

4
src/blackcore/webdataservices.cpp
View File

@@ -1124,7 +1124,7 @@ namespace BlackCore
{ {
// with info objects wait until info objects are loaded // with info objects wait until info objects are loaded
Q_ASSERT_X(!entities.testFlag(CEntityFlags::DbInfoObjectEntity), Q_FUNC_INFO, "Info object must be read upfront, do not pass as entity here"); Q_ASSERT_X(!entities.testFlag(CEntityFlags::DbInfoObjectEntity), Q_FUNC_INFO, "Info object must be read upfront, do not pass as entity here");
const bool waitForDbInfoReader = m_dbInfoDataReader && !m_dbInfoDataReader->areAllDataRead() && !m_dbInfoDataReader->isMarkedAsFailed(); const bool waitForDbInfoReader = m_dbInfoDataReader && !m_dbInfoDataReader->areAllInfoObjectsRead() && !m_dbInfoDataReader->isMarkedAsFailed();
if (waitForDbInfoReader) if (waitForDbInfoReader)
{ {
// do not read yet, will call this function again after some time // do not read yet, will call this function again after some time
@@ -1182,7 +1182,7 @@ namespace BlackCore
} }
else if (reader->hasReceivedFirstReply()) else if (reader->hasReceivedFirstReply())
{ {
if (reader->areAllDataRead()) if (reader->areAllInfoObjectsRead())
{ {
// we have all data and carry on // we have all data and carry on
CLogMessage(this).info("Info objects (%1) for '%2' loaded from '%3'") << info << CEntityFlags::flagToString(entities) << reader->getInfoObjectsUrl().toQString(); CLogMessage(this).info("Info objects (%1) for '%2' loaded from '%3'") << info << CEntityFlags::flagToString(entities) << reader->getInfoObjectsUrl().toQString();