Fixed clazy warnings: empty QStringLiteral.

This commit is contained in:
Mat Sutcliffe
2018-12-17 16:40:59 +00:00
parent 268d858e2d
commit 333ea1b8df
37 changed files with 81 additions and 83 deletions

View File

@@ -399,7 +399,7 @@ namespace BlackMisc
QString CAircraftIcaoCode::getDesignatorManufacturer() const
{
return (this->hasDesignator() ? this->getDesignator() : QStringLiteral("????")) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QStringLiteral(""));
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QString());
}
bool CAircraftIcaoCode::hasManufacturer() const
@@ -478,8 +478,8 @@ namespace BlackMisc
QString CAircraftIcaoCode::getCombinedIcaoStringWithKey() const
{
return (this->hasDesignator() ? this->getDesignator() : QStringLiteral("????")) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QStringLiteral("")) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QStringLiteral("")) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QString()) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QString()) %
this->getDbKeyAsStringInParentheses(" ");
}
@@ -487,9 +487,9 @@ namespace BlackMisc
{
if (!this->hasIataCode()) { return ""; }
return this->getIataCode() % QStringLiteral(" [IATA") %
(this->hasDesignator() ? (QStringLiteral(" ") % this->getDesignator()) : QStringLiteral("")) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QStringLiteral("")) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QStringLiteral("")) %
(this->hasDesignator() ? (QStringLiteral(" ") % this->getDesignator()) : QString()) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QString()) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QString()) %
this->getDbKeyAsStringInParentheses(" ");
}
@@ -497,9 +497,9 @@ namespace BlackMisc
{
if (!this->hasFamily()) { return ""; }
return this->getFamily() % QStringLiteral(" [family") %
(this->hasDesignator() ? (QStringLiteral(" ") % this->getDesignator()) : QStringLiteral("")) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QStringLiteral("")) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QStringLiteral("")) %
(this->hasDesignator() ? (QStringLiteral(" ") % this->getDesignator()) : QString()) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QString()) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QString()) %
this->getDbKeyAsStringInParentheses(" ");
}