Aircraft ICAO data should use ICAO code as attribute, this somehow got lost in the merge session, re-applied

This commit is contained in:
Klaus Basan
2015-05-16 18:31:30 +02:00
parent 257430bbbe
commit 104122023c
19 changed files with 170 additions and 212 deletions

View File

@@ -160,12 +160,17 @@ void Client::presetCallsignCmd(QTextStream &args)
void Client::presetIcaoCodesCmd(QTextStream &args)
{
QString acTypeICAO;
QString descriptionICAO;
QString descriptionICAO; //! \todo Is this the combined type ("L2J")?
QString airlineICAO;
QString livery;
QString color;
args >> acTypeICAO >> descriptionICAO >> airlineICAO >> livery >> color;
emit presetIcaoCodes(BlackMisc::Aviation::CAircraftIcaoData(acTypeICAO, descriptionICAO, airlineICAO, livery, color));
BlackMisc::Aviation::CAircraftIcaoData icaoData(
CAircraftIcaoCode(acTypeICAO, descriptionICAO),
CAirlineIcaoCode(airlineICAO),
color);
icaoData.setLivery(livery);
emit presetIcaoCodes(icaoData);
}
void Client::presetLoginModeCmd(QTextStream &args)