refs #614, refs #638 removed redundant m_livery from CSimulatedAircraft and improved convertTOQString

* removed some leftovers in simulated aircraft such as virtual functions
* use livery from model instead of keeping a redundant copy
This commit is contained in:
Klaus Basan
2016-04-09 23:09:20 +02:00
parent fdd7fa62d5
commit 368d803d42
4 changed files with 36 additions and 27 deletions

View File

@@ -44,10 +44,12 @@ namespace BlackMisc
QString CAircraftModel::convertToQString(bool i18n) const
{
QString s = this->m_modelString;
if (!s.isEmpty()) { s += " tpye: "; }
if (!s.isEmpty()) { s += " type: "; }
s += this->getModelTypeAsString();
s += ' ';
s += this->m_aircraftIcao.toQString(i18n);
s += this->getAircraftIcaoCode().toQString(i18n);
s += ' ';
s += this->m_livery.toQString(i18n);
if (!this->m_fileName.isEmpty())
{
s += ' ';
@@ -417,6 +419,7 @@ namespace BlackMisc
case TypeModelMatchingDefaultModel: return "map. default";
case TypeOwnSimulatorModel: return "own simulator";
case TypeManuallySet: return "set";
case TypeFsdData: return "FSD";
case TypeUnknown:
default: return "unknown";
}