flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +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/blackmisc/simulation/fscommon/aircraftmapper.cpp
View File

@@ -62,11 +62,11 @@ namespace BlackMisc
return m_init;
}
CAircraftIcao CAircraftMapper::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CAircraftMapper::getIcaoForModelString(const QString &modelString) const
{
if (modelString.isEmpty() || !this->isInitialized()) { return CAircraftIcao(); }
if (modelString.isEmpty() || !this->isInitialized()) { return CAircraftIcaoData(); }
CAircraftMappingList mappings = this->m_mappings->getMappingList().findByModelString(modelString);
if (mappings.isEmpty()) { return CAircraftIcao(); }
if (mappings.isEmpty()) { return CAircraftIcaoData(); }
return mappings.front().getIcao();
}
@@ -80,7 +80,7 @@ namespace BlackMisc
CAircraftCfgEntriesList el = this->m_entries.findByTitle(title, caseSensitivity);
if (el.isEmpty()) { return CAircraftModel(); }
CAircraftModel model = el.front().toAircraftModel();
CAircraftIcao icao = this->getIcaoForModelString(model.getModelString());
CAircraftIcaoData icao = this->getIcaoForModelString(model.getModelString());
model.setIcao(icao);
return model;
}
@@ -111,7 +111,7 @@ namespace BlackMisc
"Boeing 737-800 Paint1",
CAircraftModel::TypeModelMatchingDefaultModel,
"B737-800 default model",
CAircraftIcao("B738", "L2J", "", "", "FFFFFF")
CAircraftIcaoData("B738", "L2J", "", "", "FFFFFF")
);
return aircraftModel;
}

2
src/blackmisc/simulation/fscommon/aircraftmapper.h
View File

@@ -78,7 +78,7 @@ namespace BlackMisc
const BlackMisc::Network::CAircraftMappingList &getAircraftMappingList() const { return m_mappings->getMappingList(); }
//! Inverse lookup
BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const;
BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const;
//! Number of aircraft entries
int countAircraftCfgEntries() const { return m_entries.size(); }