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

refs #937 Resolved clazy warnings: QString::arg.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-04-15 01:29:17 +01:00
parent b20ebd6dfd
commit a8302b310e
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/aircraftmatcher.cpp
View File

@@ -315,8 +315,8 @@ namespace BlackCore
const CAirlineIcaoCode icao = sApp->getWebDataServices()->smartAirlineIcaoSelector(designator, callsign);
if (log)
{
if (icao.hasValidDbKey()) { CMatchingUtils::addLogDetailsToList(log, callsign, QString("Reverse lookup of airline '%1' and callsign '%2' found '%3'").arg(designator).arg(callsign.asString()).arg(icao.getDesignator()), CAircraftMatcher::getLogCategories()); }
else { CMatchingUtils::addLogDetailsToList(log, callsign, QString("Reverse lookup of airline '%1' and callsign '%2', nothing found").arg(designator).arg(callsign.asString()), CAircraftMatcher::getLogCategories()); }
if (icao.hasValidDbKey()) { CMatchingUtils::addLogDetailsToList(log, callsign, QString("Reverse lookup of airline '%1' and callsign '%2' found '%3'").arg(designator, callsign.asString(), icao.getDesignator()), CAircraftMatcher::getLogCategories()); }
else { CMatchingUtils::addLogDetailsToList(log, callsign, QString("Reverse lookup of airline '%1' and callsign '%2', nothing found").arg(designator, callsign.asString()), CAircraftMatcher::getLogCategories()); }
}
return icao;
}
@@ -335,7 +335,7 @@ namespace BlackCore
const CLivery livery = sApp->getWebDataServices()->getStdLiveryForAirlineCode(airline);
if (log)
{
if (livery.hasValidDbKey()) { CMatchingUtils::addLogDetailsToList(log, callsign, QString("Reverse lookup of standard livery for '%1' found '%2'").arg(airline.getDesignator()).arg(livery.getCombinedCode()), CAircraftMatcher::getLogCategories()); }
if (livery.hasValidDbKey()) { CMatchingUtils::addLogDetailsToList(log, callsign, QString("Reverse lookup of standard livery for '%1' found '%2'").arg(airline.getDesignator(), livery.getCombinedCode()), CAircraftMatcher::getLogCategories()); }
else { CMatchingUtils::addLogDetailsToList(log, callsign, QString("Not standard livery for airline '%1'").arg(airline.getDesignator()), CAircraftMatcher::getLogCategories()); }
}
return livery;
@@ -348,7 +348,7 @@ namespace BlackCore
if (icao.hasValidDesignator())
{
CMatchingUtils::addLogDetailsToList(log, callsign, QString("Turned callsign %1 into airline %2").arg(callsign.asString()).arg(icao.getDesignator()), getLogCategories());
CMatchingUtils::addLogDetailsToList(log, callsign, QString("Turned callsign %1 into airline %2").arg(callsign.asString(), icao.getDesignator()), getLogCategories());
}
else
{

5
src/blackcore/airspacemonitor.cpp
View File

@@ -834,8 +834,7 @@ namespace BlackCore
CStatusMessageList reverseLookupMessages;
CStatusMessageList *pReverseLookupMessages = this->isReverseLookupMessagesEnabled() ? &reverseLookupMessages : nullptr;
CMatchingUtils::addLogDetailsToList(pReverseLookupMessages, callsign, QString("FsInn data from network: aircraft '%1', airline '%2', model '%3', combined '%4'").
arg(aircraftIcaoDesignator).arg(airlineIcaoDesignator).
arg(modelString).arg(combinedAircraftType));
arg(aircraftIcaoDesignator, airlineIcaoDesignator, modelString, combinedAircraftType));
this->addOrUpdateAircraftInRange(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, "", modelString, CAircraftModel::TypeFSInnData, pReverseLookupMessages);
this->addReverseLookupMessages(callsign, reverseLookupMessages);
@@ -853,7 +852,7 @@ namespace BlackCore
CStatusMessageList reverseLookupMessages;
CStatusMessageList *pReverseLookupMessages = this->isReverseLookupMessagesEnabled() ? &reverseLookupMessages : nullptr;
CMatchingUtils::addLogDetailsToList(pReverseLookupMessages, callsign, QString("Data from network: aircraft '%1', airline '%2', livery '%3'").
arg(aircraftIcaoDesignator).arg(airlineIcaoDesignator).arg(livery),
arg(aircraftIcaoDesignator, airlineIcaoDesignator, livery),
getLogCategories());
const CClient client = this->getOtherClientOrDefaultForCallsign(callsign);

2
src/blackmisc/dbusserver.cpp
View File

@@ -380,7 +380,7 @@ namespace BlackMisc
// todo: Replace assert with input validation
Q_ASSERT_X(CNetworkUtils::isValidIPv4Address(p), "CDBusServer::p2pAddress", "Wrong IP in String");
return QString("tcp:host=%1,port=%2").arg(h).arg(p);
return QString("tcp:host=%1,port=%2").arg(h, p);
}
const QString &CDBusServer::p2pConnectionName()

2
src/blackmisc/geo/coordinategeodetic.cpp
View File

@@ -28,7 +28,7 @@ namespace BlackMisc
QString CCoordinateGeodetic::convertToQString(bool i18n) const
{
QString s = "Geodetic: {%1, %2, %3}";
return s.arg(this->latitude().valueRoundedWithUnit(6, i18n)).arg(this->longitude().valueRoundedWithUnit(6, i18n)).arg(this->m_geodeticHeight.valueRoundedWithUnit(6, i18n));
return s.arg(this->latitude().valueRoundedWithUnit(6, i18n), this->longitude().valueRoundedWithUnit(6, i18n), this->m_geodeticHeight.valueRoundedWithUnit(6, i18n));
}
CCoordinateGeodetic CCoordinateGeodetic::fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const CAltitude &geodeticHeight)

4
src/blackmisc/pq/time.cpp
View File

@@ -114,7 +114,7 @@ namespace BlackMisc
QString m = QString("00%1").arg(QString::number(parts.at(1))).right(2);
QString s = QString("00%1").arg(QString::number(parts.at(2))).right(2);
QString fs = QString("%1:%2:%3").arg(h).arg(m).arg(s);
QString fs = QString("%1:%2:%3").arg(h, m, s);
if (this->isNegativeWithEpsilonConsidered())
{
return QString("-").append(fs);
@@ -142,7 +142,7 @@ namespace BlackMisc
QList<int> parts = getHrsMinSecParts();
QString h = QString("00%1").arg(QString::number(parts.at(0))).right(2);
QString m = QString("00%1").arg(QString::number(parts.at(1))).right(2);
QString fs = QString("%1:%2").arg(h).arg(m);
QString fs = QString("%1:%2").arg(h, m);
if (this->isNegativeWithEpsilonConsidered())
{
return QString("-").append(fs);

2
src/blackmisc/weather/windlayer.cpp
View File

@@ -80,7 +80,7 @@ namespace BlackMisc
if (m_directionFrom != CAngle() && m_directionTo != CAngle())
{
windAsString += QString("variable between %1 and %2 ").arg(m_directionFrom.toQString()).arg(m_directionTo.toQString());
windAsString += QString("variable between %1 and %2 ").arg(m_directionFrom.toQString(), m_directionTo.toQString());
}
windAsString += QString("at %2").arg(m_speed.toQString());