Ref T215, some adjustments of user object

* remove "valid" from some functions, because no validity is checked
* homebase + real name string
This commit is contained in:
Klaus Basan
2018-01-03 20:13:47 +01:00
parent b2c0d726bc
commit 2fb7bde447
10 changed files with 45 additions and 37 deletions

View File

@@ -153,10 +153,10 @@ namespace BlackMisc
void setAircraftIcaoDesignator(const QString &designator);
//! Has valid realname?
bool hasValidRealName() const { return m_pilot.hasValidRealName(); }
bool hasRealName() const { return m_pilot.hasRealName(); }
//! Has valid id?
bool hasValidId() const { return m_pilot.hasValidId(); }
bool hasId() const { return m_pilot.hasId(); }
//! Valid designator?
bool hasAircraftDesignator() const;

View File

@@ -69,7 +69,7 @@ namespace BlackMisc
bool CSimulatedAircraftList::updateWithVatsimDataFileData(CSimulatedAircraft &aircraftToBeUpdated) const
{
if (this->isEmpty()) return false;
if (aircraftToBeUpdated.hasValidRealName() && aircraftToBeUpdated.hasValidId() && aircraftToBeUpdated.hasAircraftAndAirlineDesignator()) { return false; }
if (aircraftToBeUpdated.hasRealName() && aircraftToBeUpdated.hasId() && aircraftToBeUpdated.hasAircraftAndAirlineDesignator()) { return false; }
CSimulatedAircraft currentDataFileAircraft = this->findFirstByCallsign(aircraftToBeUpdated.getCallsign());
if (currentDataFileAircraft.getCallsign().isEmpty()) return false;