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

Fixed clazy warnings: empty QStringLiteral.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -59,7 +59,7 @@ namespace BlackMisc
QString CAircraftModel::convertToQString(bool i18n) const
{
const QString s =
(this->hasModelString() ? inApostrophes(m_modelString, true) % QStringLiteral(" ") : QStringLiteral("")) %
(this->hasModelString() ? inApostrophes(m_modelString, true) % QStringLiteral(" ") : QString()) %
QStringLiteral(" type: '") % this->getModelTypeAsString() %
QStringLiteral("' ICAO: '") % this->getAircraftIcaoCode().toQString(i18n) %
QStringLiteral(" CG: ") % this->getCG().valueRoundedWithUnit(1) %
@@ -534,11 +534,11 @@ namespace BlackMisc
QString CAircraftModel::getSwiftLiveryString() const
{
const QString l =
(this->getLivery().hasValidDbKey() ? QStringLiteral("l") % this->getLivery().getDbKeyAsString() : QStringLiteral("")) %
(this->getAircraftIcaoCode().hasValidDbKey() ? QStringLiteral("a") % this->getAircraftIcaoCode().getDbKeyAsString() : QStringLiteral("")) %
(this->hasValidDbKey() ? QStringLiteral("m") % this->getDbKeyAsString() : QStringLiteral(""));
(this->getLivery().hasValidDbKey() ? QStringLiteral("l") % this->getLivery().getDbKeyAsString() : QString()) %
(this->getAircraftIcaoCode().hasValidDbKey() ? QStringLiteral("a") % this->getAircraftIcaoCode().getDbKeyAsString() : QString()) %
(this->hasValidDbKey() ? QStringLiteral("m") % this->getDbKeyAsString() : QString());
return l.isEmpty() ? QStringLiteral("") : liveryStringPrefix() % l;
return l.isEmpty() ? QString() : liveryStringPrefix() % l;
}
DBTripleIds CAircraftModel::parseNetworkLiveryString(const QString &liveryString)

2
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -1217,7 +1217,7 @@ namespace BlackMisc
(
checkModel.hasAirlineDesignator() ?
QStringLiteral(" airline '") % checkModel.getAirlineIcaoCodeDesignator() % QStringLiteral("': ") % boolToYesNo(airlineForModel) :
QStringLiteral("")
QString()
);
}

10
src/blackmisc/simulation/fscommon/fscommonutil.cpp
View File

@@ -118,7 +118,7 @@ namespace BlackMisc
QString CFsCommonUtil::fsxSimObjectsDirFromSimDir(const QString &simDir)
{
if (simDir.isEmpty()) { return QStringLiteral(""); }
if (simDir.isEmpty()) { return {}; }
return CFileUtils::appendFilePaths(simDir, "SimObjects");
}
@@ -221,7 +221,7 @@ namespace BlackMisc
QString CFsCommonUtil::p3dSimObjectsDirFromSimDir(const QString &simDir)
{
if (simDir.isEmpty()) { return QStringLiteral(""); }
if (simDir.isEmpty()) { return {}; }
return CFileUtils::appendFilePaths(simDir, "SimObjects");
}
@@ -293,7 +293,7 @@ namespace BlackMisc
QString fs9AircraftDirFromRegistryImpl()
{
QString fs9Path = CFsCommonUtil::fs9DirFromRegistry();
if (fs9Path.isEmpty()) { return QStringLiteral(""); }
if (fs9Path.isEmpty()) { return {}; }
return CFsCommonUtil::fs9AircraftDirFromSimDir(fs9Path);
}
@@ -306,7 +306,7 @@ namespace BlackMisc
QString fs9AircraftDirImpl()
{
const QString dir(CFsCommonUtil::fs9Dir());
if (dir.isEmpty()) { return QStringLiteral(""); }
if (dir.isEmpty()) { return {}; }
return CFsCommonUtil::fs9AircraftDirFromSimDir(dir);
}
@@ -318,7 +318,7 @@ namespace BlackMisc
QString CFsCommonUtil::fs9AircraftDirFromSimDir(const QString &simDir)
{
if (simDir.isEmpty()) { return QStringLiteral(""); }
if (simDir.isEmpty()) { return {}; }
return CFileUtils::appendFilePaths(simDir, "Aircraft");
}

12
src/blackmisc/simulation/interpolationlogger.cpp
View File

@@ -339,7 +339,7 @@ namespace BlackMisc
QStringLiteral("<td>") % log.cgAboveGround.valueRoundedWithUnit(ft, 0) % QStringLiteral("</td>") %
QStringLiteral("<td>") % boolToYesNo(log.useParts) % QStringLiteral("</td>") %
(changedParts ? QStringLiteral("<td class=\"changed\">*</td>") : QStringLiteral("<td></td>")) %
QStringLiteral("<td>") % (log.useParts ? log.parts.toQString(true) : QStringLiteral("")) % QStringLiteral("</td>") %
QStringLiteral("<td>") % (log.useParts ? log.parts.toQString(true) : QString()) % QStringLiteral("</td>") %
QStringLiteral("</tr>\n");
}
@@ -411,13 +411,13 @@ namespace BlackMisc
return (
withSetup ?
QStringLiteral("setup: ") % usedSetup.toQString(true) % separator :
QStringLiteral("")
QString()
) %
(
withElevation ?
QStringLiteral("Elev.info: ") % elevationInfo %
QStringLiteral(" scenery os: ") % sceneryOffset.valueRoundedWithUnit(1) % separator :
QStringLiteral("")
QString()
) %
QStringLiteral("change: ") % change.toQString(true) %
separator %
@@ -441,13 +441,13 @@ namespace BlackMisc
QStringLiteral(" | old int.pos.: ") % situationOldInterpolation.getTimestampAndOffset(true) %
QStringLiteral(" | new int.pos.: ") % situationNewInterpolation.getTimestampAndOffset(true) %
QStringLiteral(" | #int.pos.: ") % QString::number(interpolationSituations.size()) :
QStringLiteral("")
QString()
) %
(
withCurrentSituation ?
separator %
QStringLiteral("cur.sit.(interpolated): ") % situationCurrent.toQString(true) :
QStringLiteral("")
QString()
) %
(
withOtherPositions ?
@@ -455,7 +455,7 @@ namespace BlackMisc
QStringLiteral("old: ") % situationOldInterpolation.toQString(true) %
separator %
QStringLiteral("new: ") % situationNewInterpolation.toQString(true) :
QStringLiteral("")
QString()
);
}

2
src/blackmisc/simulation/interpolator.cpp
View File

@@ -650,7 +650,7 @@ namespace BlackMisc
QStringLiteral(" | situation valid: ") % boolToYesNo(m_isValidSituation) %
QStringLiteral(" | same: ") % boolToYesNo(m_isSameSituation) %
(
m_extraInfo.isEmpty() ? QStringLiteral("") : QStringLiteral(" info: ") % m_extraInfo
m_extraInfo.isEmpty() ? QString() : QStringLiteral(" info: ") % m_extraInfo
);
}

10
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -156,11 +156,11 @@ namespace BlackMisc
Q_UNUSED(i18n);
const Simulator s = getSimulator();
const QString str =
(s.testFlag(FSX) ? QStringLiteral("FSX ") : QStringLiteral("")) %
(s.testFlag(FS9) ? QStringLiteral("FS9 ") : QStringLiteral("")) %
(s.testFlag(P3D) ? QStringLiteral("P3D ") : QStringLiteral("")) %
(s.testFlag(XPLANE) ? QStringLiteral("XPlane ") : QStringLiteral("")) %
(s.testFlag(FG) ? QStringLiteral("FG ") : QStringLiteral(""));
(s.testFlag(FSX) ? QStringLiteral("FSX ") : QString()) %
(s.testFlag(FS9) ? QStringLiteral("FS9 ") : QString()) %
(s.testFlag(P3D) ? QStringLiteral("P3D ") : QString()) %
(s.testFlag(XPLANE) ? QStringLiteral("XPlane ") : QString()) %
(s.testFlag(FG) ? QStringLiteral("FG ") : QString());
return str.trimmed();
}