diff --git a/samples/blackmiscdbus/main.cpp b/samples/blackmiscdbus/main.cpp index a3a9d5c22..d0c626354 100644 --- a/samples/blackmiscdbus/main.cpp +++ b/samples/blackmiscdbus/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) port = cmdlineArgs.at(cmdlineArgs.length() - 1); } } - QString addressTcp = QString("tcp:host=%1,port=%2").arg(ip).arg(port); + QString addressTcp = QString("tcp:host=%1,port=%2").arg(ip, port); QString address(useSessionBusForServer ? "session" : addressTcp); // testing with real transfer // Create a Testservice instance and register it with the session bus only if @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) if (mode.startsWith("l")) { ip = "127.0.0.1"; - addressTcp = QString("tcp:host=%1,port=%2").arg(ip).arg(port); + addressTcp = QString("tcp:host=%1,port=%2").arg(ip, port); goto Menu; } if (mode.startsWith("i")) @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) if (p.length() > 1) { ip = p.at(1); - addressTcp = QString("tcp:host=%1,port=%2").arg(ip).arg(port); + addressTcp = QString("tcp:host=%1,port=%2").arg(ip, port); } goto Menu; } @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) if (p.length() > 1) { port = p.at(1); - addressTcp = QString("tcp:host=%1,port=%2").arg(ip).arg(port); + addressTcp = QString("tcp:host=%1,port=%2").arg(ip, port); } goto Menu; } diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index 6a598c551..6a605bf16 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/blackcore/aircraftmatcher.cpp @@ -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 { diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 220cad042..22ce98746 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -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); diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp index 1a136298e..43ec86fed 100644 --- a/src/blackmisc/dbusserver.cpp +++ b/src/blackmisc/dbusserver.cpp @@ -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() diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index b1ae1a293..4ae7566ec 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -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) diff --git a/src/blackmisc/pq/time.cpp b/src/blackmisc/pq/time.cpp index dc279712a..772c61a10 100644 --- a/src/blackmisc/pq/time.cpp +++ b/src/blackmisc/pq/time.cpp @@ -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 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); diff --git a/src/blackmisc/weather/windlayer.cpp b/src/blackmisc/weather/windlayer.cpp index 08c85f9d3..76bfc96f6 100644 --- a/src/blackmisc/weather/windlayer.cpp +++ b/src/blackmisc/weather/windlayer.cpp @@ -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());