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

refs #290 using a CRange of iterator adaptors in implementating the tertiary predicate-based methods of the derived containers,

Browse Source 
but preserving the return-by-copy for API stability
This commit is contained in:
Mathew Sutcliffe
2014-07-04 23:32:38 +01:00
parent 98a6854f8c
commit a4b317b100
17 changed files with 71 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blacksim/simulatorinfolist.cpp
View File

@@ -17,13 +17,7 @@ namespace BlackSim
QStringList CSimulatorInfoList::toStringList(bool i18n) const
{
QStringList infoList;
foreach(CSimulatorInfo info, (*this))
{
QString i = info.toQString(i18n);
infoList.append(i);
}
return infoList;
return this->transform([i18n](const CSimulatorInfo &info) { return info.toQString(i18n); });
}
void CSimulatorInfoList::registerMetadata()

9
src/blacksim/simulatormodelmappings.cpp
View File

@@ -20,9 +20,14 @@ namespace BlackSim
return this->m_mappings;
}
BlackMisc::Network::CAircraftMappingList ISimulatorModelMappings::findByIcao(const BlackMisc::Aviation::CAircraftIcao &icao, bool emptyMeansWildCard) const
BlackMisc::Network::CAircraftMappingList ISimulatorModelMappings::findByIcaoWildcard(const BlackMisc::Aviation::CAircraftIcao &icao) const
{
return this->m_mappings.findByIcaoCode(icao, emptyMeansWildCard);
return this->m_mappings.findByIcaoCodeWildcard(icao);
}
BlackMisc::Network::CAircraftMappingList ISimulatorModelMappings::findByIcaoExact(const BlackMisc::Aviation::CAircraftIcao &icao) const
{
return this->m_mappings.findByIcaoCodeExact(icao);
}
} // namespace

7
src/blacksim/simulatormodelmappings.h
View File

@@ -37,8 +37,11 @@ namespace BlackSim
//! Get list
const BlackMisc::Network::CAircraftMappingList &getMappingList() const;
//! Find by ICAO code
BlackMisc::Network::CAircraftMappingList findByIcao(const BlackMisc::Aviation::CAircraftIcao &icao, bool emptyMeansWildCard = true) const;
//! Find by ICAO code, empty fields are treated as wildcards
BlackMisc::Network::CAircraftMappingList findByIcaoWildcard(const BlackMisc::Aviation::CAircraftIcao &icao) const;
//! Find by ICAO code, empty fields are treated literally
BlackMisc::Network::CAircraftMappingList findByIcaoExact(const BlackMisc::Aviation::CAircraftIcao &icao) const;
protected:
BlackMisc::Network::CAircraftMappingList m_mappings; //!< Mappings