From f58b3bf0656ec42a363b6835f0cb6d309f5b4000 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 31 May 2016 17:03:09 +0200 Subject: [PATCH] refs #649, refs #659 use new timestamp function --- src/blackcore/db/icaodatareader.cpp | 6 +++--- src/blackmisc/simulation/data/modelcaches.cpp | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/blackcore/db/icaodatareader.cpp b/src/blackcore/db/icaodatareader.cpp index ae2c2d70f..59079e793 100644 --- a/src/blackcore/db/icaodatareader.cpp +++ b/src/blackcore/db/icaodatareader.cpp @@ -403,9 +403,9 @@ namespace BlackCore { switch (entity) { - case CEntityFlags::AircraftIcaoEntity: return this->m_aircraftIcaoCache.getTimestamp(); - case CEntityFlags::AirlineIcaoEntity: return this->m_airlineIcaoCache.getTimestamp(); - case CEntityFlags::CountryEntity: return this->m_countryCache.getTimestamp(); + case CEntityFlags::AircraftIcaoEntity: return this->m_aircraftIcaoCache.getAvailableTimestamp(); + case CEntityFlags::AirlineIcaoEntity: return this->m_airlineIcaoCache.getAvailableTimestamp(); + case CEntityFlags::CountryEntity: return this->m_countryCache.getAvailableTimestamp(); default: return QDateTime(); } } diff --git a/src/blackmisc/simulation/data/modelcaches.cpp b/src/blackmisc/simulation/data/modelcaches.cpp index 322caaf77..d8b50c1d6 100644 --- a/src/blackmisc/simulation/data/modelcaches.cpp +++ b/src/blackmisc/simulation/data/modelcaches.cpp @@ -109,10 +109,10 @@ namespace BlackMisc Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); switch (simulator.getSimulator()) { - case CSimulatorInfo::FS9: return this->m_modelCacheFs9.getTimestamp(); - case CSimulatorInfo::FSX: return this->m_modelCacheFsx.getTimestamp(); - case CSimulatorInfo::P3D: return this->m_modelCacheP3D.getTimestamp(); - case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.getTimestamp(); + case CSimulatorInfo::FS9: return this->m_modelCacheFs9.getAvailableTimestamp(); + case CSimulatorInfo::FSX: return this->m_modelCacheFsx.getAvailableTimestamp(); + case CSimulatorInfo::P3D: return this->m_modelCacheP3D.getAvailableTimestamp(); + case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.getAvailableTimestamp(); default: Q_ASSERT_X(false, Q_FUNC_INFO, "wrong simulator"); return QDateTime(); @@ -198,10 +198,10 @@ namespace BlackMisc Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); switch (simulator.getSimulator()) { - case CSimulatorInfo::FS9: return this->m_modelCacheFs9.getTimestamp(); - case CSimulatorInfo::FSX: return this->m_modelCacheFsx.getTimestamp(); - case CSimulatorInfo::P3D: return this->m_modelCacheP3D.getTimestamp(); - case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.getTimestamp(); + case CSimulatorInfo::FS9: return this->m_modelCacheFs9.getAvailableTimestamp(); + case CSimulatorInfo::FSX: return this->m_modelCacheFsx.getAvailableTimestamp(); + case CSimulatorInfo::P3D: return this->m_modelCacheP3D.getAvailableTimestamp(); + case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.getAvailableTimestamp(); default: Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); return QDateTime();