refs #638, refs #614, support for military flag and swift livery string

* fixed missing tuple attribute
* improved toQString conversion
This commit is contained in:
Klaus Basan
2016-04-11 19:37:57 +02:00
parent d9e550beef
commit 826662cbb5
5 changed files with 69 additions and 3 deletions

View File

@@ -262,6 +262,7 @@ namespace BlackMisc
if (!this->hasIataCode()) { return ""; }
QString s(getIataCode());
s = s.append(" [IATA]");
if (hasDesignator()) { s.append(" ").append(getDesignator()); }
if (hasManufacturer()) { s = s.append(" ").append(getManufacturer()); }
if (hasModelDescription()) { s = s.append(" ").append(getModelDescription()); }
return s.append(" ").append(getDbKeyAsStringInParentheses());
@@ -272,8 +273,9 @@ namespace BlackMisc
if (!this->hasFamily()) { return ""; }
QString s(getFamily());
s = s.append(" [family]");
if (hasManufacturer()) { s = s.append(" ").append(getManufacturer()); }
if (hasModelDescription()) { s = s.append(" ").append(getModelDescription()); }
if (hasDesignator()) { s.append(" ").append(getDesignator()); }
if (hasManufacturer()) { s.append(" ").append(getManufacturer()); }
if (hasModelDescription()) { s.append(" ").append(getModelDescription()); }
return s.append(" ").append(getDbKeyAsStringInParentheses());
}