Ref T259, Ref T243 adjusted providers to use common base classes

This commit is contained in:
Klaus Basan
2018-03-12 18:01:26 +01:00
parent d99a1cac87
commit 4b7237ce1b
21 changed files with 341 additions and 196 deletions

View File

@@ -26,92 +26,92 @@ namespace BlackMisc
CSimulatedAircraft COwnAircraftAware::getOwnAircraft() const
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraft();
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->getOwnAircraft();
}
CCoordinateGeodetic COwnAircraftAware::getOwnAircraftPosition() const
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraftPosition();
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->getOwnAircraftPosition();
}
CAircraftSituation COwnAircraftAware::getOwnAircraftSituation() const
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraftSituation();
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->getOwnAircraftSituation();
}
CAircraftParts COwnAircraftAware::getOwnAircraftParts() const
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraftParts();
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->getOwnAircraftParts();
}
CAircraftModel COwnAircraftAware::getOwnAircraftModel() const
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraftModel();
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->getOwnAircraftModel();
}
CLength COwnAircraftAware::getDistanceToOwnAircraft(const Geo::ICoordinateGeodetic &position) const
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getDistanceToOwnAircraft(position);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->getDistanceToOwnAircraft(position);
}
bool COwnAircraftAware::updateCockpit(const CSimulatedAircraft &aircraft, const CIdentifier &originator)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateCockpit(aircraft, originator);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateCockpit(aircraft, originator);
}
bool COwnAircraftAware::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const CIdentifier &originator)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateCockpit(com1, com2, transponder, originator);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateCockpit(com1, com2, transponder, originator);
}
bool COwnAircraftAware::updateActiveComFrequency(const CFrequency &frequency, CComSystem::ComUnit comUnit, const CIdentifier &originator)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateActiveComFrequency(frequency, comUnit, originator);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateActiveComFrequency(frequency, comUnit, originator);
}
bool COwnAircraftAware::updateSelcal(const CSelcal &selcal, const CIdentifier &originator)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateSelcal(selcal, originator);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateSelcal(selcal, originator);
}
bool COwnAircraftAware::updateOwnModel(const CAircraftModel &model)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnModel(model);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateOwnModel(model);
}
bool COwnAircraftAware::updateOwnSituation(const CAircraftSituation &situation)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnSituation(situation);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateOwnSituation(situation);
}
bool COwnAircraftAware::updateOwnParts(const CAircraftParts &parts)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnParts(parts);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateOwnParts(parts);
}
bool COwnAircraftAware::updateOwnCallsign(const CCallsign &callsign)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnCallsign(callsign);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateOwnCallsign(callsign);
}
bool COwnAircraftAware::updateOwnIcaoCodes(const CAircraftIcaoCode &aircraftIcaoData, const CAirlineIcaoCode &airlineIcaoCode)
{
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnIcaoCodes(aircraftIcaoData, airlineIcaoCode);
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->updateOwnIcaoCodes(aircraftIcaoData, airlineIcaoCode);
}
} // namespace
} // namespace