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

Ref T298, improved matching log messages

Browse Source
This commit is contained in:
Klaus Basan
2018-08-17 01:43:07 +02:00
parent 418769ccf8
commit dc534fc88c
4 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/aviation/livery.cpp
View File

@@ -69,20 +69,17 @@ namespace BlackMisc
QString CLivery::getCombinedCodePlusInfo() const
{
QString s = this->getCombinedCode();
if (!this->getDescription().isEmpty())
{
s += " ";
s += this->getDescription();
}
return s;
return this->getCombinedCode() % (
this->getDescription().isEmpty() ?
QStringLiteral("") :
(QStringLiteral(" ") % this->getDescription())
);
}
QString CLivery::getCombinedCodePlusInfoAndId() const
{
QString s = this->getCombinedCodePlusInfo();
s += this->getDbKeyAsStringInParentheses(" ");
return s;
return this->getCombinedCodePlusInfo() %
this->getDbKeyAsStringInParentheses(" ");
}
bool CLivery::isContainedInSimplifiedAirlineName(const QString &candidate) const