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

MS & KB workshop: ICAO class renamings.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-12 22:46:17 +01:00
parent c136724cd0
commit b65232b202
71 changed files with 226 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/airspace_monitor.cpp
View File

@@ -312,7 +312,7 @@ namespace BlackCore
return m_otherClients;
}
BlackMisc::Aviation::CInformationMessage CAirspaceMonitor::getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode)
BlackMisc::Aviation::CInformationMessage CAirspaceMonitor::getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode)
{
CInformationMessage metar;
if (airportIcaoCode.isEmpty()) return metar;
@@ -513,7 +513,7 @@ namespace BlackCore
// ICAO response from custom data
if (!aircraftDesignator.isEmpty())
{
CAircraftIcao icao(aircraftDesignator, combinedAircraftType, airlineIcao, "", ""); // from custom packet
CAircraftIcaoData icao(aircraftDesignator, combinedAircraftType, airlineIcao, "", ""); // from custom packet
if (aircraftContainsCallsign)
{
// we have that aircraft, set straight away
@@ -802,7 +802,7 @@ namespace BlackCore
}
}
void CAirspaceMonitor::ps_icaoCodesReceived(const CCallsign &callsign, const CAircraftIcao &icaoData)
void CAirspaceMonitor::ps_icaoCodesReceived(const CCallsign &callsign, const CAircraftIcaoData &icaoData)
{
Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this));
Q_ASSERT(!callsign.isEmpty());
@@ -814,7 +814,7 @@ namespace BlackCore
{
// empty so far, try to fetch from data file
CLogMessage(this).warning("Empty ICAO info for %1 %2") << callsign.toQString() << icaoData.toQString();
CAircraftIcao icaoDataFromDataFile = this->m_vatsimDataFileReader->getIcaoInfo(callsign);
CAircraftIcaoData icaoDataFromDataFile = this->m_vatsimDataFileReader->getIcaoInfo(callsign);
if (!icaoDataFromDataFile.hasAircraftDesignator()) { return; } // give up!
vm = CPropertyIndexVariantMap(CAircraft::IndexIcao, icaoDataFromDataFile.toCVariant());
}
@@ -862,7 +862,7 @@ namespace BlackCore
bool setIcao = false;
if (this->m_icaoCodeCache.contains(callsign))
{
CAircraftIcao icao = this->m_icaoCodeCache.value(callsign);
CAircraftIcaoData icao = this->m_icaoCodeCache.value(callsign);
this->m_icaoCodeCache.remove(callsign);
aircraft.setIcaoInfo(icao);
setIcao = true;

8
src/blackcore/airspace_monitor.h
View File

@@ -117,7 +117,7 @@ namespace BlackCore
BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const;
//! Returns a METAR for the given airport, if available
BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode);
BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode);
//! Returns the current online ATC stations
BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const { return m_atcStationsOnline; }
@@ -211,9 +211,9 @@ namespace BlackCore
CPartsPerCallsign m_partsByCallsign; //!< parts, for performance reasons per callsign
BlackMisc::Aviation::CCallsignSet m_aircraftSupportingParts; //!< aircraft supporting parts
QMap<BlackMisc::Aviation::CAirportIcao, BlackMisc::Aviation::CInformationMessage> m_metarCache;
QMap<BlackMisc::Aviation::CAirportIcaoCode, BlackMisc::Aviation::CInformationMessage> m_metarCache;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan> m_flightPlanCache;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftIcao> m_icaoCodeCache;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftIcaoData> m_icaoCodeCache;
INetwork *m_network = nullptr;
CVatsimBookingReader *m_vatsimBookingReader = nullptr;
@@ -273,7 +273,7 @@ namespace BlackCore
void ps_atisReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &atisMessage);
void ps_atisVoiceRoomReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &url);
void ps_atisLogoffTimeReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &zuluTime);
void ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData);
void ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoData &icaoData);
void ps_pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
void ps_frequencyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &frequency);
void ps_receivedBookings(const BlackMisc::Aviation::CAtcStationList &bookedStations);

2
src/blackcore/context_network.h
View File

@@ -221,7 +221,7 @@ namespace BlackCore
virtual bool parseCommandLine(const QString &commandLine, const QString &originator) = 0;
//! Get METAR, if not available request it (code such as EDDF, KLAX)
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode) = 0;
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) = 0;
//! Use the selected COM1/2 frequencies, and get the corresponding voice room for it
virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const = 0;

2
src/blackcore/context_network_empty.h
View File

@@ -134,7 +134,7 @@ namespace BlackCore
}
//! \copydoc IContextNetwork::getMetar
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode) override
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) override
{
Q_UNUSED(airportIcaoCode);
logEmptyContextWarning(Q_FUNC_INFO);

2
src/blackcore/context_network_impl.cpp
View File

@@ -662,7 +662,7 @@ namespace BlackCore
this->m_airspace->testAddAircraftParts(parts, incremental);
}
BlackMisc::Aviation::CInformationMessage CContextNetwork::getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode)
BlackMisc::Aviation::CInformationMessage CContextNetwork::getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << airportIcaoCode; }
return m_airspace->getMetar(airportIcaoCode);

2
src/blackcore/context_network_impl.h
View File

@@ -173,7 +173,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IContextNetwork::getMetar
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode) override;
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) override;
//! \copydoc IContextNetwork::getSelectedVoiceRooms()
virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;

2
src/blackcore/context_network_proxy.cpp
View File

@@ -268,7 +268,7 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CFlightPlan>(QLatin1Literal("loadFlightPlanFromNetwork"), callsign);
}
CInformationMessage CContextNetworkProxy::getMetar(const CAirportIcao &airportIcaoCode)
CInformationMessage CContextNetworkProxy::getMetar(const CAirportIcaoCode &airportIcaoCode)
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CInformationMessage>(QLatin1Literal("getMetar"), airportIcaoCode);
}

2
src/blackcore/context_network_proxy.h
View File

@@ -100,7 +100,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IContextNetwork::getMetar
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode) override;
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) override;
//! \copydoc IContextNetwork::getSelectedVoiceRooms()
virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;

6
src/blackcore/context_ownaircraft.h
View File

@@ -15,7 +15,7 @@
#include "blackcoreexport.h"
#include "blackcore/context.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/audio/voiceroomlist.h"
#include "blackmisc/aviation/selcal.h"
@@ -75,7 +75,7 @@ namespace BlackCore
void changedCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! Own ICAO was changed
void changedIcaoData(const BlackMisc::Aviation::CAircraftIcao &icao);
void changedIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icao);
//! own pilot (aka the swift user) changed
void changedPilot(const BlackMisc::Network::CUser &pilot);
@@ -98,7 +98,7 @@ namespace BlackCore
virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) = 0;
//! Set ICAO data
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) = 0;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) = 0;
//! Set callsign
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0;

6
src/blackcore/context_ownaircraft_impl.cpp
View File

@@ -92,7 +92,7 @@ namespace BlackCore
// TODO: This would need to come from somewhere (mappings)
// Own callsign, plane ICAO status, model used
this->m_ownAircraft.setIcaoInfo(CAircraftIcao("C172", "L1P", "GA", "GA", "0000ff"));
this->m_ownAircraft.setIcaoInfo(CAircraftIcaoData("C172", "L1P", "GA", "GA", "0000ff"));
}
// voice rooms, if network is already available
@@ -229,7 +229,7 @@ namespace BlackCore
return true;
}
bool CContextOwnAircraft::updateOwnIcaoData(const CAircraftIcao &icaoData)
bool CContextOwnAircraft::updateOwnIcaoData(const CAircraftIcaoData &icaoData)
{
{
QWriteLocker l(&m_lockAircraft);
@@ -270,7 +270,7 @@ namespace BlackCore
{
QWriteLocker l(&m_lockAircraft);
this->m_ownAircraft.setModel(ownAircraft.getModel());
CAircraftIcao icao(ownAircraft.getIcaoInfo());
CAircraftIcaoData icao(ownAircraft.getIcaoInfo());
if (icao.hasAircraftDesignator())
{
// if the model knows its ICAO, cool

2
src/blackcore/context_ownaircraft_impl.h
View File

@@ -78,7 +78,7 @@ namespace BlackCore
//! \copydoc IContextOwnAircraft::updateOwnIcaoData
//! \ingroup ownaircraftprovider
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) override;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) override;
//! \copydoc IContextOwnAircraft::updatePosition
virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) override;

2
src/blackcore/context_ownaircraft_proxy.cpp
View File

@@ -70,7 +70,7 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateOwnCallsign"), callsign);
}
bool CContextOwnAircraftProxy::updateOwnIcaoData(const CAircraftIcao &icaoData)
bool CContextOwnAircraftProxy::updateOwnIcaoData(const CAircraftIcaoData &icaoData)
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateOwnIcaoData"), icaoData);
}

4
src/blackcore/context_ownaircraft_proxy.h
View File

@@ -15,7 +15,7 @@
#include "blackcoreexport.h"
#include "blackcore/context_ownaircraft.h"
#include "blackmisc/genericdbusinterface.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/simulation/simulatedaircraft.h"
namespace BlackCore
@@ -57,7 +57,7 @@ namespace BlackCore
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc IContextOwnAircraft::updateOwnIcaoData
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) override;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) override;
//! \copydoc IContextOwnAircraft::setAudioOutputVolumes
virtual void setAudioOutputVolume(int outputVolume) override;

2
src/blackcore/context_simulator.h
View File

@@ -129,7 +129,7 @@ namespace BlackCore
virtual BlackMisc::Simulation::CAircraftModelList getInstalledModelsStartingWith(const QString modelString) const = 0;
//! ICAO data for model string
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const = 0;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const = 0;
//! Set time synchronization between simulator and user's computer time
//! \remarks not all drivers implement this, e.g. if it is an intrinsic simulator feature

4
src/blackcore/context_simulator_impl.cpp
View File

@@ -202,10 +202,10 @@ namespace BlackCore
m_simulatorPlugin->simulator->reloadInstalledModels();
}
CAircraftIcao CContextSimulator::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CContextSimulator::getIcaoForModelString(const QString &modelString) const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << modelString; }
if (!m_simulatorPlugin) { return CAircraftIcao(); }
if (!m_simulatorPlugin) { return CAircraftIcaoData(); }
Q_ASSERT(m_simulatorPlugin->simulator);
return m_simulatorPlugin->simulator->getIcaoForModelString(modelString);

2
src/blackcore/context_simulator_impl.h
View File

@@ -86,7 +86,7 @@ namespace BlackCore
virtual void reloadInstalledModels() override;
//! \copydoc IContextSimulator::getIcaoForModelString
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const override;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override;
//! \copydoc IContextSimulator::setTimeSynchronization
virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) override;

4
src/blackcore/context_simulator_proxy.cpp
View File

@@ -105,9 +105,9 @@ namespace BlackCore
m_dBusInterface->callDBus(QLatin1Literal("reloadInstalledModels"));
}
CAircraftIcao CContextSimulatorProxy::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CContextSimulatorProxy::getIcaoForModelString(const QString &modelString) const
{
return m_dBusInterface->callDBusRet<CAircraftIcao>(QLatin1Literal("getIcaoForModelString"), modelString);
return m_dBusInterface->callDBusRet<CAircraftIcaoData>(QLatin1Literal("getIcaoForModelString"), modelString);
}
BlackMisc::Simulation::CSimulatorPluginInfo CContextSimulatorProxy::getSimulatorPluginInfo() const

2
src/blackcore/context_simulator_proxy.h
View File

@@ -76,7 +76,7 @@ namespace BlackCore
virtual void reloadInstalledModels() override;
//! \copydoc IContextSimulator::getIcaoForModelString
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const override;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override;
//! \copydoc IContextSimulator::getSimulatorPluginInfo
virtual BlackMisc::Simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override;

8
src/blackcore/network.h
View File

@@ -175,7 +175,7 @@ namespace BlackCore
* Set our own aircraft ICAO codes before connecting.
* \pre Network must be disconnected when calling this function.
*/
virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcao &icao) = 0;
virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoData &icao) = 0;
/*!
* Select a login mode before connecting.
@@ -362,7 +362,7 @@ namespace BlackCore
* \pre Network must be connected when calling this function.
* \sa metarReplyReceived
*/
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) = 0;
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) = 0;
/*!
* Send a message querying the weather data for the airport with a specific ICAO code.
@@ -371,7 +371,7 @@ namespace BlackCore
* \sa windDataReplyReceived
* \sa cloudDataReplyReceived
*/
virtual void sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) = 0;
virtual void sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) = 0;
signals:
//! @}
@@ -436,7 +436,7 @@ namespace BlackCore
* We received a reply to one of our queries.
* \sa sendIcaoCodesQuery
*/
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icao);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoData &icao);
/*!
* We received a notification of the state of another aircraft on the network.

12
src/blackcore/network_vatlib.cpp
View File

@@ -299,7 +299,7 @@ namespace BlackCore
updateOwnCallsign(callsign);
}
void CNetworkVatlib::presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcao &icao)
void CNetworkVatlib::presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoData &icao)
{
Q_ASSERT_X(isDisconnected(), "CNetworkVatlib", "Can't change ICAO codes while still connected");
m_icaoCode = icao;
@@ -591,13 +591,13 @@ namespace BlackCore
Vat_SendPing(m_net.data(), toFSD(callsign));
}
void CNetworkVatlib::sendMetarQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao)
void CNetworkVatlib::sendMetarQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao)
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
Vat_RequestMetar(m_net.data(), toFSD(airportIcao.asString()));
}
void CNetworkVatlib::sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao)
void CNetworkVatlib::sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao)
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
Vat_RequestWeather(m_net.data(), toFSD(airportIcao.asString()));
@@ -607,7 +607,7 @@ namespace BlackCore
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
CSimulatedAircraft myAircraft(getOwnAircraft());
CAircraftIcao icao = myAircraft.getIcaoInfo();
CAircraftIcaoData icao = myAircraft.getIcaoInfo();
QString modelString = myAircraft.getModel().getModelString();
if (modelString.isEmpty()) { modelString = defaultModelString(); }
@@ -621,7 +621,7 @@ namespace BlackCore
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
CSimulatedAircraft myAircraft(getOwnAircraft());
CAircraftIcao icao = myAircraft.getIcaoInfo();
CAircraftIcaoData icao = myAircraft.getIcaoInfo();
QString modelString = myAircraft.getModel().getModelString();
if (modelString.isEmpty()) { modelString = defaultModelString(); }
@@ -1023,7 +1023,7 @@ namespace BlackCore
void CNetworkVatlib::onPilotInfoReceived(VatSessionID, const char *callsign, const VatAircraftInfo *aircraftInfo, void *cbvar)
{
BlackMisc::Aviation::CAircraftIcao icao;
BlackMisc::Aviation::CAircraftIcaoData icao;
icao.setAircraftDesignator(aircraftInfo->aircraftType);
icao.setAirlineDesignator(aircraftInfo->airline);
icao.setLivery(aircraftInfo->livery);

8
src/blackcore/network_vatlib.h
View File

@@ -47,7 +47,7 @@ namespace BlackCore
virtual void presetLoginMode(LoginMode mode) override;
virtual void presetServer(const BlackMisc::Network::CServer &server) override;
virtual void presetCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcao &icao) override;
virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoData &icao) override;
virtual void presetSimulatorInfo(const BlackMisc::Simulation::CSimulatorPluginInfo &simInfo) override;
virtual void initiateConnection() override;
virtual void terminateConnection() override;
@@ -87,8 +87,8 @@ namespace BlackCore
//! \name Weather functions
//! @{
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) override;
virtual void sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) override;
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) override;
virtual void sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) override;
//! @}
private slots:
@@ -174,7 +174,7 @@ namespace BlackCore
BlackMisc::Network::CServer m_server;
BlackMisc::Simulation::CSimulatorPluginInfo m_simulatorInfo;
BlackMisc::Aviation::CCallsign m_callsign; //!< "buffered callsign", as this must not change when connected
BlackMisc::Aviation::CAircraftIcao m_icaoCode; //!< "buffered icao", as this must not change when connected
BlackMisc::Aviation::CAircraftIcaoData m_icaoCode; //!< "buffered icao", as this must not change when connected
QTimer m_processingTimer;
QTimer m_positionUpdateTimer;

2
src/blackcore/simulator.h
View File

@@ -100,7 +100,7 @@ namespace BlackCore
virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator) = 0;
//! ICAO data for model string
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const = 0;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const = 0;
//! Display a status message in the simulator
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const = 0;

6
src/blackcore/vatsimdatafilereader.cpp
View File

@@ -79,7 +79,7 @@ namespace BlackCore
return this->getPilotsForCallsigns(callsigns);
}
CAircraftIcao CVatsimDataFileReader::getIcaoInfo(const CCallsign &callsign)
CAircraftIcaoData CVatsimDataFileReader::getIcaoInfo(const CCallsign &callsign)
{
CAircraft aircraft = this->getAircraft().findFirstByCallsign(callsign);
return aircraft.getIcaoInfo();
@@ -267,9 +267,9 @@ namespace BlackCore
// we expect something like H/B772/F B773 B773/F
static const QRegularExpression reg("/.");
icaoCode = icaoCode.replace(reg, "").trimmed().toUpper();
if (CAircraftIcao::isValidDesignator(icaoCode))
if (CAircraftIcaoData::isValidDesignator(icaoCode))
{
currentAircraft.setIcaoInfo(CAircraftIcao(icaoCode));
currentAircraft.setIcaoInfo(CAircraftIcaoData(icaoCode));
}
else
{

2
src/blackcore/vatsimdatafilereader.h
View File

@@ -87,7 +87,7 @@ namespace BlackCore
//! ICAO info for callsign
//! \threadsafe
BlackMisc::Aviation::CAircraftIcao getIcaoInfo(const BlackMisc::Aviation::CCallsign &callsign);
BlackMisc::Aviation::CAircraftIcaoData getIcaoInfo(const BlackMisc::Aviation::CCallsign &callsign);
//! Voice capability for callsign
//! \threadsafe