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

Ref T129, fixed const correctness in VATSIM data reader

Browse Source
This commit is contained in:
Klaus Basan
2017-10-01 22:09:51 +02:00
committed by Mathew Sutcliffe
parent 0e68bbf851
commit 34faabb6c5
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackcore/vatsim/vatsimdatafilereader.cpp
View File

@@ -96,30 +96,30 @@ namespace BlackCore
return m_lastGoodSetup.get().getFsdServers(); return m_lastGoodSetup.get().getFsdServers();
} }
CUserList CVatsimDataFileReader::getPilotsForCallsigns(const CCallsignSet &callsigns) CUserList CVatsimDataFileReader::getPilotsForCallsigns(const CCallsignSet &callsigns) const
{ {
return this->getAircraft().findByCallsigns(callsigns).transform(Predicates::MemberTransform(&CSimulatedAircraft::getPilot)); return this->getAircraft().findByCallsigns(callsigns).transform(Predicates::MemberTransform(&CSimulatedAircraft::getPilot));
} }
CUserList CVatsimDataFileReader::getPilotsForCallsign(const CCallsign &callsign) CUserList CVatsimDataFileReader::getPilotsForCallsign(const CCallsign &callsign) const
{ {
const CCallsignSet callsigns({callsign}); const CCallsignSet callsigns({callsign});
return this->getPilotsForCallsigns(callsigns); return this->getPilotsForCallsigns(callsigns);
} }
CAirlineIcaoCode CVatsimDataFileReader::getAirlineIcaoCode(const CCallsign &callsign) CAirlineIcaoCode CVatsimDataFileReader::getAirlineIcaoCode(const CCallsign &callsign) const
{ {
const CSimulatedAircraft aircraft = this->getAircraft().findFirstByCallsign(callsign); const CSimulatedAircraft aircraft = this->getAircraft().findFirstByCallsign(callsign);
return aircraft.getAirlineIcaoCode(); return aircraft.getAirlineIcaoCode();
} }
CAircraftIcaoCode CVatsimDataFileReader::getAircraftIcaoCode(const CCallsign &callsign) CAircraftIcaoCode CVatsimDataFileReader::getAircraftIcaoCode(const CCallsign &callsign) const
{ {
const CSimulatedAircraft aircraft = this->getAircraft().findFirstByCallsign(callsign); const CSimulatedAircraft aircraft = this->getAircraft().findFirstByCallsign(callsign);
return aircraft.getAircraftIcaoCode(); return aircraft.getAircraftIcaoCode();
} }
CVoiceCapabilities CVatsimDataFileReader::getVoiceCapabilityForCallsign(const CCallsign &callsign) CVoiceCapabilities CVatsimDataFileReader::getVoiceCapabilityForCallsign(const CCallsign &callsign) const
{ {
if (callsign.isEmpty()) { return CVoiceCapabilities(); } if (callsign.isEmpty()) { return CVoiceCapabilities(); }
QReadLocker rl(&m_lock); QReadLocker rl(&m_lock);
@@ -128,7 +128,7 @@ namespace BlackCore
CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Unknown); CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Unknown);
} }
QString CVatsimDataFileReader::getFlightPlanRemarksForCallsign(const CCallsign &callsign) QString CVatsimDataFileReader::getFlightPlanRemarksForCallsign(const CCallsign &callsign) const
{ {
if (callsign.isEmpty()) { return QString(); } if (callsign.isEmpty()) { return QString(); }
QReadLocker rl(&m_lock); QReadLocker rl(&m_lock);
@@ -140,24 +140,24 @@ namespace BlackCore
this->getAircraft().updateWithVatsimDataFileData(aircraftToBeUdpated); this->getAircraft().updateWithVatsimDataFileData(aircraftToBeUdpated);
} }
CUserList CVatsimDataFileReader::getControllersForCallsign(const CCallsign &callsign) CUserList CVatsimDataFileReader::getControllersForCallsign(const CCallsign &callsign) const
{ {
const CCallsignSet cs({callsign}); const CCallsignSet cs({callsign});
return this->getControllersForCallsigns(cs); return this->getControllersForCallsigns(cs);
} }
CUserList CVatsimDataFileReader::getControllersForCallsigns(const CCallsignSet &callsigns) CUserList CVatsimDataFileReader::getControllersForCallsigns(const CCallsignSet &callsigns) const
{ {
return this->getAtcStations().findByCallsigns(callsigns).transform(Predicates::MemberTransform(&CAtcStation::getController)); return this->getAtcStations().findByCallsigns(callsigns).transform(Predicates::MemberTransform(&CAtcStation::getController));
} }
CUserList CVatsimDataFileReader::getUsersForCallsign(const CCallsign &callsign) CUserList CVatsimDataFileReader::getUsersForCallsign(const CCallsign &callsign) const
{ {
const CCallsignSet callsigns({callsign}); const CCallsignSet callsigns({callsign});
return this->getUsersForCallsigns(callsigns); return this->getUsersForCallsigns(callsigns);
} }
CUserList CVatsimDataFileReader::getUsersForCallsigns(const CCallsignSet &callsigns) CUserList CVatsimDataFileReader::getUsersForCallsigns(const CCallsignSet &callsigns) const
{ {
CUserList users; CUserList users;
if (callsigns.isEmpty()) { return users; } if (callsigns.isEmpty()) { return users; }

21
src/blackcore/vatsim/vatsimdatafilereader.h
View File

@@ -18,6 +18,7 @@
#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/callsignset.h"
#include "blackmisc/aviation/flightplanutils.h"
#include "blackmisc/network/entityflags.h" #include "blackmisc/network/entityflags.h"
#include "blackmisc/network/serverlist.h" #include "blackmisc/network/serverlist.h"
#include "blackmisc/network/userlist.h" #include "blackmisc/network/userlist.h"
@@ -74,43 +75,43 @@ namespace BlackCore
//! Users for callsign(s) //! Users for callsign(s)
//! \threadsafe //! \threadsafe
BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns); BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const;
//! User for callsign //! User for callsign
//! \threadsafe //! \threadsafe
BlackMisc::Network::CUserList getUsersForCallsign(const BlackMisc::Aviation::CCallsign &callsign); BlackMisc::Network::CUserList getUsersForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
//! Controllers for callsigns //! Controllers for callsigns
//! \threadsafe //! \threadsafe
BlackMisc::Network::CUserList getControllersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns); BlackMisc::Network::CUserList getControllersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const;
//! Controllers for callsign //! Controllers for callsign
//! \threadsafe //! \threadsafe
BlackMisc::Network::CUserList getControllersForCallsign(const BlackMisc::Aviation::CCallsign &callsign); BlackMisc::Network::CUserList getControllersForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
//! Users for callsigns //! Users for callsigns
//! \threadsafe //! \threadsafe
BlackMisc::Network::CUserList getPilotsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns); BlackMisc::Network::CUserList getPilotsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const;
//! Users for callsign //! Users for callsign
//! \threadsafe //! \threadsafe
BlackMisc::Network::CUserList getPilotsForCallsign(const BlackMisc::Aviation::CCallsign &callsign); BlackMisc::Network::CUserList getPilotsForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
//! Aircraft ICAO info for callsign //! Aircraft ICAO info for callsign
//! \threadsafe //! \threadsafe
BlackMisc::Aviation::CAircraftIcaoCode getAircraftIcaoCode(const BlackMisc::Aviation::CCallsign &callsign); BlackMisc::Aviation::CAircraftIcaoCode getAircraftIcaoCode(const BlackMisc::Aviation::CCallsign &callsign) const;
//! Airline ICAO info for callsign //! Airline ICAO info for callsign
//! \threadsafe //! \threadsafe
BlackMisc::Aviation::CAirlineIcaoCode getAirlineIcaoCode(const BlackMisc::Aviation::CCallsign &callsign); BlackMisc::Aviation::CAirlineIcaoCode getAirlineIcaoCode(const BlackMisc::Aviation::CCallsign &callsign) const;
//! Voice capability for callsign //! Voice capability for callsign
//! \threadsafe //! \threadsafe
BlackMisc::Network::CVoiceCapabilities getVoiceCapabilityForCallsign(const BlackMisc::Aviation::CCallsign &callsign); BlackMisc::Network::CVoiceCapabilities getVoiceCapabilityForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
//! Flight plan remarks for callsign //! Flight plan remarks for callsign
//! \threadsafe //! \threadsafe
QString getFlightPlanRemarksForCallsign(const BlackMisc::Aviation::CCallsign &callsign); QString getFlightPlanRemarksForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
//! Update aircraft with VATSIM aircraft data from data file //! Update aircraft with VATSIM aircraft data from data file
//! \threadsafe //! \threadsafe