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

refactor: Remove nested if

Browse Source
This commit is contained in:
Lars Toenning
2025-06-09 13:16:22 +02:00
parent 2578cd3c9f
commit 22d3a2b7f5
1 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/core/webdataservices.cpp
View File

@@ -218,38 +218,32 @@ namespace swift::core
CEntityFlags::Entity triggeredRead = CEntityFlags::NoEntity;
if (m_airportDataReader)
if (m_airportDataReader && whatToRead.testFlag(CEntityFlags::AirportEntity))
{
if (whatToRead.testFlag(CEntityFlags::AirportEntity))
{
CEntityFlags::Entity airportEntities = whatToRead & CEntityFlags::AirportEntity;
m_airportDataReader->readInBackgroundThread(airportEntities, newerThan);
triggeredRead |= CEntityFlags::AirportEntity;
}
CEntityFlags::Entity airportEntities = whatToRead & CEntityFlags::AirportEntity;
m_airportDataReader->readInBackgroundThread(airportEntities, newerThan);
triggeredRead |= CEntityFlags::AirportEntity;
}
if (m_icaoDataReader)
const bool shouldReadIcaoData = whatToRead.testFlag(CEntityFlags::AircraftIcaoEntity) ||
whatToRead.testFlag(CEntityFlags::AircraftCategoryEntity) ||
whatToRead.testFlag(CEntityFlags::AirlineIcaoEntity) ||
whatToRead.testFlag(CEntityFlags::CountryEntity);
if (m_icaoDataReader && shouldReadIcaoData)
{
if (whatToRead.testFlag(CEntityFlags::AircraftIcaoEntity) ||
whatToRead.testFlag(CEntityFlags::AircraftCategoryEntity) ||
whatToRead.testFlag(CEntityFlags::AirlineIcaoEntity) ||
whatToRead.testFlag(CEntityFlags::CountryEntity))
{
CEntityFlags::Entity icaoEntities = whatToRead & CEntityFlags::AllIcaoCountriesCategory;
m_icaoDataReader->readInBackgroundThread(icaoEntities, newerThan);
triggeredRead |= icaoEntities;
}
CEntityFlags::Entity icaoEntities = whatToRead & CEntityFlags::AllIcaoCountriesCategory;
m_icaoDataReader->readInBackgroundThread(icaoEntities, newerThan);
triggeredRead |= icaoEntities;
}
if (m_modelDataReader)
const bool shouldReadModelData = whatToRead.testFlag(CEntityFlags::LiveryEntity) ||
whatToRead.testFlag(CEntityFlags::DistributorEntity) ||
whatToRead.testFlag(CEntityFlags::ModelEntity);
if (m_modelDataReader && shouldReadModelData)
{
if (whatToRead.testFlag(CEntityFlags::LiveryEntity) ||
whatToRead.testFlag(CEntityFlags::DistributorEntity) || whatToRead.testFlag(CEntityFlags::ModelEntity))
{
CEntityFlags::Entity modelEntities = whatToRead & CEntityFlags::DistributorLiveryModel;
m_modelDataReader->readInBackgroundThread(modelEntities, newerThan);
triggeredRead |= modelEntities;
}
CEntityFlags::Entity modelEntities = whatToRead & CEntityFlags::DistributorLiveryModel;
m_modelDataReader->readInBackgroundThread(modelEntities, newerThan);
triggeredRead |= modelEntities;
}
return triggeredRead;
@@ -1458,7 +1452,6 @@ namespace swift::core
if (waitForDbInfoReader)
{
// do not read yet, will call this function again after some time
// see CWebDataServices::waitForInfoObjects
if (!this->waitForDbInfoObjectsThenRead(entities)) { return; }
}
@@ -1467,7 +1460,6 @@ namespace swift::core
if (waitForSharedInfoFile)
{
// do not read yet, will call this function again after some time
// CWebDataServices::waitForInfoObjects
if (!this->waitForSharedInfoObjectsThenRead(entities)) { return; }
}
}