From 6c05c5249d9c2171382b9f1521f62dd40435bec0 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Thu, 20 Dec 2018 21:32:39 +0000 Subject: [PATCH] When calling `arg()` on a QString constructed from a literal, use QStringLiteral. --- samples/blackmiscdbus/main.cpp | 8 +++--- samples/blackmiscdbus/servicetool.cpp | 2 +- src/blackcore/airspacemonitor.cpp | 14 +++++----- src/blackcore/application.cpp | 2 +- src/blackcore/context/contextaudio.cpp | 4 +-- .../context/contextsimulatorimpl.cpp | 4 +-- src/blackcore/data/launchersetup.cpp | 2 +- src/blackcore/db/airportdatareader.cpp | 2 +- src/blackcore/db/databasereader.cpp | 6 ++--- src/blackcore/db/icaodatareader.cpp | 6 ++--- src/blackcore/db/modeldatareader.cpp | 6 ++--- src/blackcore/setupreader.cpp | 10 +++---- src/blackcore/simulator.cpp | 2 +- src/blackcore/vatsim/vatsimdatafilereader.cpp | 2 +- src/blackcore/vatsim/voicechannelvatlib.cpp | 2 +- .../aircraftmodelstringcompleter.cpp | 2 +- .../components/copyconfigurationcomponent.cpp | 3 +-- ...ymodelsfromotherswiftversionscomponent.cpp | 16 +++++------- .../copysettingsandcachescomponent.cpp | 4 +-- .../dbautosimulatorstashingcomponent.cpp | 2 +- .../components/dbautostashingcomponent.cpp | 4 +-- .../components/dbownmodelscomponent.cpp | 3 +-- .../components/dbownmodelsetcomponent.cpp | 3 +-- src/blackgui/components/dbstashcomponent.cpp | 4 +-- src/blackgui/components/downloadcomponent.cpp | 9 +++---- .../components/infobarstatuscomponent.cpp | 2 +- .../components/interpolationlogdisplay.cpp | 3 +-- src/blackgui/components/logincomponent.cpp | 6 ++--- .../components/rawfsdmessagescomponent.cpp | 3 +-- src/blackgui/components/scalescreenfactor.cpp | 7 +++-- .../components/settingshotkeycomponent.cpp | 2 +- .../components/setuploadingdialog.cpp | 2 +- .../components/transpondercodespinbox.cpp | 2 +- src/blackgui/copyxswiftbusdialog.cpp | 4 +-- src/blackgui/guiapplication.cpp | 3 +-- src/blackgui/guiutility.cpp | 17 +++++------- src/blackgui/infoarea.cpp | 5 ++-- src/blackgui/models/columnformatters.cpp | 3 +-- src/blackgui/settings/guisettings.cpp | 3 +-- src/blackgui/settings/textmessagesettings.cpp | 3 +-- src/blackgui/shortcut.cpp | 3 +-- src/blackgui/stylesheetutility.cpp | 2 +- src/blackgui/views/viewbasenontemplate.cpp | 2 +- src/blackmisc/atomicfile.cpp | 2 +- src/blackmisc/audio/voicesetup.cpp | 3 +-- src/blackmisc/aviation/aircraftengine.cpp | 3 +-- src/blackmisc/aviation/aircrafticaocode.cpp | 26 +++++++------------ src/blackmisc/aviation/aircraftsituation.cpp | 3 +-- src/blackmisc/aviation/airlineicaocode.cpp | 10 +++---- src/blackmisc/aviation/altitude.cpp | 3 +-- src/blackmisc/aviation/flightplan.cpp | 2 +- src/blackmisc/aviation/heading.cpp | 5 ++-- src/blackmisc/aviation/livery.cpp | 11 ++++---- src/blackmisc/datacache.cpp | 2 +- src/blackmisc/db/dbinfo.cpp | 3 +-- src/blackmisc/dbusserver.cpp | 2 +- src/blackmisc/fileutils.cpp | 5 ++-- src/blackmisc/geo/coordinategeodetic.cpp | 3 +-- src/blackmisc/geo/elevationplane.cpp | 3 +-- src/blackmisc/input/joystickbutton.cpp | 2 +- src/blackmisc/jsonexception.cpp | 6 ++--- src/blackmisc/network/rawfsdmessage.cpp | 3 +-- src/blackmisc/network/remotefile.cpp | 3 +-- src/blackmisc/network/server.cpp | 3 +-- src/blackmisc/network/urllist.cpp | 2 +- src/blackmisc/network/urlloglist.cpp | 3 +-- src/blackmisc/nullable.cpp | 4 +-- src/blackmisc/orderable.cpp | 4 +-- src/blackmisc/pq/time.cpp | 14 +++++----- src/blackmisc/processinfo.cpp | 4 +-- src/blackmisc/propertyindexvariantmap.cpp | 2 +- src/blackmisc/simulation/aircraftmodel.cpp | 5 ++-- .../simulation/aircraftmodellist.cpp | 10 +++---- src/blackmisc/simulation/distributor.cpp | 2 +- .../fscommon/aircraftcfgentries.cpp | 4 +-- .../simulation/fscommon/fscommonutil.cpp | 8 +++--- .../simulation/fsx/simconnectutilities.cpp | 8 +++--- .../simulation/interpolationlogger.cpp | 10 +++---- .../interpolationrenderingsetup.cpp | 2 +- .../simulation/settings/modelsettings.cpp | 3 +-- .../simulation/simulatedaircraft.cpp | 3 +-- .../simulation/simulatorplugininfo.cpp | 2 +- src/blackmisc/test/testing.cpp | 14 +++++----- src/blackmisc/threadutils.cpp | 3 +-- src/blackmisc/timestampbased.cpp | 13 +++++----- src/blackmisc/timestampobjectlist.h | 2 +- src/blackmisc/valuecache.cpp | 6 ++--- src/blackmisc/weather/cloudlayer.cpp | 2 +- src/blackmisc/weather/metar.cpp | 12 ++++----- src/blackmisc/weather/temperaturelayer.cpp | 2 +- src/blackmisc/weather/visibilitylayer.cpp | 2 +- .../weather/weatherdataplugininfo.cpp | 2 +- src/blackmisc/weather/windlayer.cpp | 8 +++--- src/blackmisc/windllutils.cpp | 14 +++++----- src/plugins/simulator/fscommon/fsuipcimpl.cpp | 5 ++-- .../fsxcommon/simulatorfsxcommon.cpp | 25 +++++++++--------- .../simulator/xplane/simulatorxplane.cpp | 5 ++-- .../testphysicalquantities.cpp | 14 +++++----- .../testinterpolatorlinear.cpp | 2 +- 99 files changed, 227 insertions(+), 291 deletions(-) diff --git a/samples/blackmiscdbus/main.cpp b/samples/blackmiscdbus/main.cpp index 25b321e33..d4b17f7ce 100644 --- a/samples/blackmiscdbus/main.cpp +++ b/samples/blackmiscdbus/main.cpp @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) port = cmdlineArgs.at(cmdlineArgs.length() - 1); } } - QString addressTcp = QString("tcp:host=%1,port=%2").arg(ip, port); + QString addressTcp = QStringLiteral("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 @@ -111,7 +111,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, port); + addressTcp = QStringLiteral("tcp:host=%1,port=%2").arg(ip, port); goto Menu; } if (mode.startsWith("i")) @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) if (p.length() > 1) { ip = p.at(1); - addressTcp = QString("tcp:host=%1,port=%2").arg(ip, port); + addressTcp = QStringLiteral("tcp:host=%1,port=%2").arg(ip, port); } goto Menu; } @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) if (p.length() > 1) { port = p.at(1); - addressTcp = QString("tcp:host=%1,port=%2").arg(ip, port); + addressTcp = QStringLiteral("tcp:host=%1,port=%2").arg(ip, port); } goto Menu; } diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp index cbce652ba..2239637ea 100644 --- a/samples/blackmiscdbus/servicetool.cpp +++ b/samples/blackmiscdbus/servicetool.cpp @@ -101,7 +101,7 @@ namespace BlackSample // The << operator is used to add the parameters for the slot const QDateTime dtnow = QDateTime::currentDateTimeUtc(); - const QString msg = QString("Con.: %1, message at %2").arg(connection.name(), dtnow.toString("MM/dd/yyyy @ hh:mm:ss")); + const QString msg = QStringLiteral("Con.: %1, message at %2").arg(connection.name(), dtnow.toString("MM/dd/yyyy @ hh:mm:ss")); m << msg; // We send this as a non-replying message. This is used for sending errors, replys, signals. diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 1dbdad644..724727da5 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -765,7 +765,7 @@ namespace BlackCore if (aircraftIcao.hasValidDbKey() && livery.hasValidDbKey()) { - CMatchingUtils::addLogDetailsToList(log, callsign, QString("Using DB livery %1 and aircraft ICAO %2 to create model").arg(livery.getDbKeyAsString(), aircraftIcao.getDbKeyAsString()), CAirspaceMonitor::getLogCategories()); + CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Using DB livery %1 and aircraft ICAO %2 to create model").arg(livery.getDbKeyAsString(), aircraftIcao.getDbKeyAsString()), CAirspaceMonitor::getLogCategories()); // we have a valid livery from DB + valid aircraft ICAO from DB CAircraftModel model(modelString, type, "By DB livery and aircraft ICAO", aircraftIcao, livery); @@ -797,8 +797,8 @@ namespace BlackCore } else { - CMatchingUtils::addLogDetailsToList(log, callsign, QString("FP remarks: '%1'").arg(fpRemarks.getRemarks())); - CMatchingUtils::addLogDetailsToList(log, callsign, QString("FP rem.parsed: '%1'").arg(fpRemarks.toQString(true))); + CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("FP remarks: '%1'").arg(fpRemarks.getRemarks())); + CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("FP rem.parsed: '%1'").arg(fpRemarks.toQString(true))); } airlineIcao = CAircraftMatcher::failoverValidAirlineIcaoDesignator(callsign, airlineIcaoString, fpRemarks.getAirlineIcao().getDesignator(), true, true, log); @@ -809,7 +809,7 @@ namespace BlackCore { const QString resolvedAirlineName = CAircraftMatcher::reverseLookupAirlineName(airlineName); airlineIcao.setName(resolvedAirlineName); - CMatchingUtils::addLogDetailsToList(log, callsign, QString("Setting resolved airline name '%1' from '%2'").arg(resolvedAirlineName, airlineName), CAirspaceMonitor::getLogCategories()); + CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Setting resolved airline name '%1' from '%2'").arg(resolvedAirlineName, airlineName), CAirspaceMonitor::getLogCategories()); } const QString telephony = CAircraftMatcher::reverseLookupTelephonyDesignator(fpRemarks.getRadioTelephony(), callsign, log); @@ -817,7 +817,7 @@ namespace BlackCore { const QString resolvedTelephony = CAircraftMatcher::reverseLookupTelephonyDesignator(telephony); airlineIcao.setTelephonyDesignator(resolvedTelephony); - CMatchingUtils::addLogDetailsToList(log, callsign, QString("Setting resolved telephony designator '%1' from '%2'").arg(resolvedTelephony, telephony), CAirspaceMonitor::getLogCategories()); + CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Setting resolved telephony designator '%1' from '%2'").arg(resolvedTelephony, telephony), CAirspaceMonitor::getLogCategories()); } } @@ -828,8 +828,8 @@ namespace BlackCore } } - CMatchingUtils::addLogDetailsToList(log, callsign, QString("Used aircraft ICAO: '%1'").arg(aircraftIcao.toQString(true)), CAirspaceMonitor::getLogCategories()); - CMatchingUtils::addLogDetailsToList(log, callsign, QString("Used airline ICAO: '%1'").arg(airlineIcao.toQString(true)), CAirspaceMonitor::getLogCategories()); + CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Used aircraft ICAO: '%1'").arg(aircraftIcao.toQString(true)), CAirspaceMonitor::getLogCategories()); + CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Used airline ICAO: '%1'").arg(airlineIcao.toQString(true)), CAirspaceMonitor::getLogCategories()); return CAircraftMatcher::reverseLookupModel(callsign, aircraftIcao, airlineIcao, liveryString, modelString, type, log); } diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 5863c4046..82de9891e 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -504,7 +504,7 @@ namespace BlackCore const QString &CApplication::swiftVersionString() const { - static const QString s(QString("swift %1").arg(versionStringDetailed())); + static const QString s(QStringLiteral("swift %1").arg(versionStringDetailed())); return s; } diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index 4623bc3ee..715e58345 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -64,8 +64,8 @@ namespace BlackCore if (this->isEmptyObject()) { return "no audio"; } const CIdentifier i = this->audioRunsWhere(); return this->isUsingImplementingObject() ? - QString("Local audio on '%1', '%2'.").arg(i.getMachineName(), i.getProcessName()) : - QString("Remote audio on '%1', '%2'.").arg(i.getMachineName(), i.getProcessName()); + QStringLiteral("Local audio on '%1', '%2'.").arg(i.getMachineName(), i.getProcessName()) : + QStringLiteral("Remote audio on '%1', '%2'.").arg(i.getMachineName(), i.getProcessName()); } } // ns } // ns diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index a840bce66..7981e38fc 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -551,11 +551,11 @@ namespace BlackCore brokenAircraft.setEnabled(false); brokenAircraft.setRendered(false); emit this->aircraftRenderingChanged(brokenAircraft); - CMatchingUtils::addLogDetailsToList(pMatchingMessages, callsign, QString("Cannot add remote aircraft, no model string: '%1'").arg(brokenAircraft.toQString())); + CMatchingUtils::addLogDetailsToList(pMatchingMessages, callsign, QStringLiteral("Cannot add remote aircraft, no model string: '%1'").arg(brokenAircraft.toQString())); return; } m_simulatorPlugin.second->logicallyAddRemoteAircraft(aircraftAfterModelApplied); - CMatchingUtils::addLogDetailsToList(pMatchingMessages, callsign, QString("Logically added remote aircraft: %1").arg(aircraftAfterModelApplied.toQString())); + CMatchingUtils::addLogDetailsToList(pMatchingMessages, callsign, QStringLiteral("Logically added remote aircraft: %1").arg(aircraftAfterModelApplied.toQString())); this->clearMatchingMessages(callsign); this->addMatchingMessages(callsign, matchingMessages); diff --git a/src/blackcore/data/launchersetup.cpp b/src/blackcore/data/launchersetup.cpp index 31d88642a..c32e85709 100644 --- a/src/blackcore/data/launchersetup.cpp +++ b/src/blackcore/data/launchersetup.cpp @@ -19,7 +19,7 @@ namespace BlackCore QString CLauncherSetup::convertToQString(bool i18n) const { Q_UNUSED(i18n); - return QString("DBus: %1 frameless: %2 mode: %3").arg(m_dBusAddress, boolToYesNo(m_windowFrameless)).arg(m_coreMode); + return QStringLiteral("DBus: %1 frameless: %2 mode: %3").arg(m_dBusAddress, boolToYesNo(m_windowFrameless)).arg(m_coreMode); } CVariant CLauncherSetup::propertyByIndex(const BlackMisc::CPropertyIndex &index) const diff --git a/src/blackcore/db/airportdatareader.cpp b/src/blackcore/db/airportdatareader.cpp index d4d13cb07..4db3050c3 100644 --- a/src/blackcore/db/airportdatareader.cpp +++ b/src/blackcore/db/airportdatareader.cpp @@ -114,7 +114,7 @@ namespace BlackCore catch (const CJsonException &ex) { emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::ReadFailed, 0); - return ex.toStatusMessage(this, QString("Reading airports from '%1'").arg(fileName)); + return ex.toStatusMessage(this, QStringLiteral("Reading airports from '%1'").arg(fileName)); } } } diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index 9813e86a2..c0c2a4873 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -218,7 +218,7 @@ namespace BlackCore // ps_read is implemented in the derived classes if (entities == CEntityFlags::NoEntity) { return; } - if (!this->isInternetAccessible(QString("No network/internet access, will not read %1").arg(CEntityFlags::flagToString(entities)))) { return; } + if (!this->isInternetAccessible(QStringLiteral("No network/internet access, will not read %1").arg(CEntityFlags::flagToString(entities)))) { return; } const bool s = QMetaObject::invokeMethod(this, "ps_read", Q_ARG(BlackMisc::Network::CEntityFlags::Entity, entities), @@ -386,7 +386,7 @@ namespace BlackCore int CDatabaseReader::requestHeadersOfSharedFiles(CEntityFlags::Entity entities) { - if (!this->isInternetAccessible(QString("No network/internet access, will not read shared file headers for %1").arg(CEntityFlags::flagToString(entities)))) { return false; } + if (!this->isInternetAccessible(QStringLiteral("No network/internet access, will not read shared file headers for %1").arg(CEntityFlags::flagToString(entities)))) { return false; } CEntityFlags::Entity allEntities = entities & CEntityFlags::AllDbEntitiesNoInfoObjects; CEntityFlags::Entity currentEntity = CEntityFlags::iterateDbEntities(allEntities); @@ -811,7 +811,7 @@ namespace BlackCore QString CDatabaseReader::HeaderResponse::getLoadTimeString() const { - return QString("%1ms").arg(getLoadTimeMs()); + return QStringLiteral("%1ms").arg(getLoadTimeMs()); } QString CDatabaseReader::HeaderResponse::getLoadTimeStringWithStartedHint() const diff --git a/src/blackcore/db/icaodatareader.cpp b/src/blackcore/db/icaodatareader.cpp index 6ce284904..27aa2420f 100644 --- a/src/blackcore/db/icaodatareader.cpp +++ b/src/blackcore/db/icaodatareader.cpp @@ -452,7 +452,7 @@ namespace BlackCore catch (const CJsonException &ex) { emit this->dataRead(CEntityFlags::CountryEntity, CEntityFlags::ReadFailed, 0); - msgs.push_back(ex.toStatusMessage(this, QString("Reading countries from '%1'").arg(fileName))); + msgs.push_back(ex.toStatusMessage(this, QStringLiteral("Reading countries from '%1'").arg(fileName))); } } } @@ -490,7 +490,7 @@ namespace BlackCore catch (const CJsonException &ex) { emit this->dataRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFailed, 0); - msgs.push_back(ex.toStatusMessage(this, QString("Reading aircraft ICAOs from '%1'").arg(fileName))); + msgs.push_back(ex.toStatusMessage(this, QStringLiteral("Reading aircraft ICAOs from '%1'").arg(fileName))); } } } @@ -528,7 +528,7 @@ namespace BlackCore catch (const CJsonException &ex) { emit this->dataRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFailed, 0); - msgs.push_back(ex.toStatusMessage(this, QString("Reading airline ICAOs from '%1'").arg(fileName))); + msgs.push_back(ex.toStatusMessage(this, QStringLiteral("Reading airline ICAOs from '%1'").arg(fileName))); } } } diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp index ea592b08c..bc800200c 100644 --- a/src/blackcore/db/modeldatareader.cpp +++ b/src/blackcore/db/modeldatareader.cpp @@ -460,7 +460,7 @@ namespace BlackCore catch (const CJsonException &ex) { emit this->dataRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFailed, 0); - msgs.push_back(ex.toStatusMessage(this, QString("Reading liveries from '%1'").arg(fileName))); + msgs.push_back(ex.toStatusMessage(this, QStringLiteral("Reading liveries from '%1'").arg(fileName))); } } } @@ -498,7 +498,7 @@ namespace BlackCore catch (const CJsonException &ex) { emit this->dataRead(CEntityFlags::ModelEntity, CEntityFlags::ReadFailed, 0); - msgs.push_back(ex.toStatusMessage(this, QString("Reading models from '%1'").arg(fileName))); + msgs.push_back(ex.toStatusMessage(this, QStringLiteral("Reading models from '%1'").arg(fileName))); } } } @@ -536,7 +536,7 @@ namespace BlackCore catch (const CJsonException &ex) { emit this->dataRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFailed, 0); - msgs.push_back(ex.toStatusMessage(this, QString("Reading distributors from '%1'").arg(fileName))); + msgs.push_back(ex.toStatusMessage(this, QStringLiteral("Reading distributors from '%1'").arg(fileName))); } } } diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp index a905a1e31..459c683fe 100644 --- a/src/blackcore/setupreader.cpp +++ b/src/blackcore/setupreader.cpp @@ -163,7 +163,7 @@ namespace BlackCore const QFile f(localSetupFileValue); if (!f.exists()) { - sApp->cmdLineErrorMessage(QString("File '%1' does not exist)").arg(localSetupFileValue)); + sApp->cmdLineErrorMessage(QStringLiteral("File '%1' does not exist)").arg(localSetupFileValue)); break; } } @@ -183,7 +183,7 @@ namespace BlackCore ok = true; break; } - retry = sApp->cmdLineErrorMessage(QString("URL '%1' not reachable").arg(urlString), true); + retry = sApp->cmdLineErrorMessage(QStringLiteral("URL '%1' not reachable").arg(urlString), true); } while (retry); } @@ -364,7 +364,7 @@ namespace BlackCore } catch (const CJsonException &ex) { - return ex.toStatusMessage(this, QString("Parsing local setup file '%1'").arg(fn)); + return ex.toStatusMessage(this, QStringLiteral("Parsing local setup file '%1'").arg(fn)); } } @@ -430,7 +430,7 @@ namespace BlackCore { // we downloaded an unparsable JSON file. // as we control those files something is wrong - const QString errorMsg = QString("Setup file loaded from '%1' cannot be parsed").arg(urlString); + const QString errorMsg = QStringLiteral("Setup file loaded from '%1' cannot be parsed").arg(urlString); const CStatusMessage msg = ex.toStatusMessage(this, errorMsg); CLogMessage::preformatted(msg); @@ -510,7 +510,7 @@ namespace BlackCore { // we downloaded an unparsable JSON file. // as we control those files something is wrong - const QString errorMsg = QString("Update info file loaded from '%1' cannot be parsed").arg(urlString); + const QString errorMsg = QStringLiteral("Update info file loaded from '%1' cannot be parsed").arg(urlString); const CStatusMessage msg = ex.toStatusMessage(this, errorMsg); CLogMessage::preformatted(msg); diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 13f04ece2..947a797da 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -82,7 +82,7 @@ namespace BlackCore Q_ASSERT_X(remoteAircraft.hasCallsign(), Q_FUNC_INFO, "Missing callsign"); const bool renderingRestricted = this->getInterpolationSetupGlobal().isRenderingRestricted(); - if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("Restricted: %1 cs: '%2' enabled: %3").arg(boolToYesNo(renderingRestricted), remoteAircraft.getCallsignAsString(), boolToYesNo(remoteAircraft.isEnabled()))); } + if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("Restricted: %1 cs: '%2' enabled: %3").arg(boolToYesNo(renderingRestricted), remoteAircraft.getCallsignAsString(), boolToYesNo(remoteAircraft.isEnabled()))); } if (!remoteAircraft.isEnabled()) { return false; } // if not restriced, directly change diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp index f050b3f1f..690c44388 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp @@ -449,7 +449,7 @@ namespace BlackCore if (clientParts.size() != clientSectionAttributes.size()) { logInconsistentData( - CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityInfo, QString("VATSIM data file client parts: %1 attributes: %2 line: '%3'").arg(clientParts.size()).arg(clientSectionAttributes.size()).arg(currentLine)) + CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityInfo, QStringLiteral("VATSIM data file client parts: %1 attributes: %2 line: '%3'").arg(clientParts.size()).arg(clientSectionAttributes.size()).arg(currentLine)) ); return parts; } diff --git a/src/blackcore/vatsim/voicechannelvatlib.cpp b/src/blackcore/vatsim/voicechannelvatlib.cpp index 53b119849..c117604c8 100644 --- a/src/blackcore/vatsim/voicechannelvatlib.cpp +++ b/src/blackcore/vatsim/voicechannelvatlib.cpp @@ -58,7 +58,7 @@ namespace BlackCore // No one else is using this voice room, so prepare to join m_voiceRoom = voiceRoom; - QString callsign = QString("%1 (%2)").arg(m_callsign.toQString(), m_userId); + QString callsign = QStringLiteral("%1 (%2)").arg(m_callsign.toQString(), m_userId); Vat_SetRoomInfo(m_voiceChannel.data(), qPrintable(voiceRoom.getHostname()), 3782, qPrintable(voiceRoom.getChannel()), qPrintable(callsign)); diff --git a/src/blackgui/components/aircraftmodelstringcompleter.cpp b/src/blackgui/components/aircraftmodelstringcompleter.cpp index 6795915f1..bc251c2bf 100644 --- a/src/blackgui/components/aircraftmodelstringcompleter.cpp +++ b/src/blackgui/components/aircraftmodelstringcompleter.cpp @@ -155,7 +155,7 @@ namespace BlackGui m_currentDataSource = dataSource; ui->le_modelString->setCompleter(new QCompleter(modelStrings, this)); - ui->le_modelString->setPlaceholderText(QString("model strings (%1/%2)").arg(modelStrings.size()).arg(simInfo)); + ui->le_modelString->setPlaceholderText(QStringLiteral("model strings (%1/%2)").arg(modelStrings.size()).arg(simInfo)); } void CAircraftModelStringCompleter::onTextChanged() diff --git a/src/blackgui/components/copyconfigurationcomponent.cpp b/src/blackgui/components/copyconfigurationcomponent.cpp index 266b4a2aa..a1a486d3e 100644 --- a/src/blackgui/components/copyconfigurationcomponent.cpp +++ b/src/blackgui/components/copyconfigurationcomponent.cpp @@ -430,8 +430,7 @@ namespace BlackGui } else { - static const QString item("swift %1 (%2)"); - ui->cb_OtherVersions->addItem(item.arg(info.getVersionString(), info.getPlatform())); + ui->cb_OtherVersions->addItem(QStringLiteral("swift %1 (%2)").arg(info.getVersionString(), info.getPlatform())); } m_otherVersionDirs.push_back(pair.first); } diff --git a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp b/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp index 0e047379a..757eb5bb0 100644 --- a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp +++ b/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp @@ -86,7 +86,7 @@ namespace BlackGui if (this->readDataFile(thisVersionModelSetFile, otherSet, otherVersion, simulator) && !otherSet.isEmpty()) { CApplication::processEventsFor(250); - if (this->confirmOverride(QString("Override model set for '%1'").arg(simulator.toQString()))) + if (this->confirmOverride(QStringLiteral("Override model set for '%1'").arg(simulator.toQString()))) { m_modelSetCaches.setModelsForSimulator(otherSet, simulator); } @@ -105,7 +105,7 @@ namespace BlackGui if (this->readDataFile(thisVersionModelCacheFile, otherCache, otherVersion, simulator) && !otherCache.isEmpty()) { CApplication::processEventsFor(250); - if (this->confirmOverride(QString("Override model cache for '%1'").arg(simulator.toQString()))) + if (this->confirmOverride(QStringLiteral("Override model cache for '%1'").arg(simulator.toQString()))) { m_modelCaches.setModelsForSimulator(otherCache, simulator); } @@ -136,8 +136,7 @@ namespace BlackGui const QFileInfo fiOtherModelFile(otherModelFile); if (!fiOtherModelFile.exists()) { - static const QString noSet("No models here: '%1'"); - ui->le_Status->setText(noSet.arg(fiOtherModelFile.absoluteFilePath())); + ui->le_Status->setText(QStringLiteral("No models here: '%1'").arg(fiOtherModelFile.absoluteFilePath())); return false; } @@ -148,18 +147,15 @@ namespace BlackGui { models = CAircraftModelList::fromMultipleJsonFormats(jsonString); ui->tvp_AircraftModels->updateContainerAsync(models); - static const QString importSet("Imported models: '%1'"); - ui->le_Status->setText(importSet.arg(fiOtherModelFile.absoluteFilePath())); + ui->le_Status->setText(QStringLiteral("Imported models: '%1'").arg(fiOtherModelFile.absoluteFilePath())); } catch (const CJsonException &ex) { - static const QString m("JSON format error. '%1'"); - this->showOverlayMessage(ex.toStatusMessage(this, m.arg(fiOtherModelFile.absoluteFilePath()))); + this->showOverlayMessage(ex.toStatusMessage(this, QStringLiteral("JSON format error. '%1'").arg(fiOtherModelFile.absoluteFilePath()))); return false; } - static const QString importSet("Imported %1 models '%2' for %3"); - ui->le_Status->setText(importSet.arg(models.size()).arg(fiOtherModelFile.fileName(), sim.toQString())); + ui->le_Status->setText(QStringLiteral("Imported %1 models '%2' for %3").arg(models.size()).arg(fiOtherModelFile.fileName(), sim.toQString())); return true; } diff --git a/src/blackgui/components/copysettingsandcachescomponent.cpp b/src/blackgui/components/copysettingsandcachescomponent.cpp index 18c5d1af5..6d62220f3 100644 --- a/src/blackgui/components/copysettingsandcachescomponent.cpp +++ b/src/blackgui/components/copysettingsandcachescomponent.cpp @@ -469,9 +469,7 @@ namespace BlackGui QString CCopySettingsAndCachesComponent::checkBoxText(const QString &text, bool setting) { - static const QString s("%1 [setting]"); - static const QString c("%1 [cache]"); - return setting ? s.arg(text) : c.arg(text); + return setting ? QStringLiteral("%1 [setting]").arg(text) : QStringLiteral("%1 [cache]").arg(text); } void CCopySettingsAndCachesWizardPage::initializePage() diff --git a/src/blackgui/components/dbautosimulatorstashingcomponent.cpp b/src/blackgui/components/dbautosimulatorstashingcomponent.cpp index 289c21462..0427377c5 100644 --- a/src/blackgui/components/dbautosimulatorstashingcomponent.cpp +++ b/src/blackgui/components/dbautosimulatorstashingcomponent.cpp @@ -50,7 +50,7 @@ namespace BlackGui { // this removes previously stashed models this->getMappingComponent()->replaceStashedModelsUnvalidated(m_modelsToStash); - const CStatusMessage stashedMsg(this, CStatusMessage::SeverityInfo, QString("Stashed %1 models").arg(m_modelsToStash.size())); + const CStatusMessage stashedMsg(this, CStatusMessage::SeverityInfo, QStringLiteral("Stashed %1 models").arg(m_modelsToStash.size())); this->addStatusMessage(stashedMsg); m_modelsToStash.clear(); } diff --git a/src/blackgui/components/dbautostashingcomponent.cpp b/src/blackgui/components/dbautostashingcomponent.cpp index e7c7a784b..a7a46613d 100644 --- a/src/blackgui/components/dbautostashingcomponent.cpp +++ b/src/blackgui/components/dbautostashingcomponent.cpp @@ -89,7 +89,7 @@ namespace BlackGui { this->currentModelView()->removeModelsWithModelString(m_modelsToStash); } - const CStatusMessage stashedMsg(this, CStatusMessage::SeverityInfo, QString("Auto stashed %1 models").arg(m_modelsToStash.size())); + const CStatusMessage stashedMsg(this, CStatusMessage::SeverityInfo, QStringLiteral("Auto stashed %1 models").arg(m_modelsToStash.size())); this->addStatusMessage(stashedMsg); m_modelsToStash.clear(); } @@ -285,7 +285,7 @@ namespace BlackGui this->updateProgressIndicator(100); sGui->processEventsToRefreshGui(); - const CStatusMessage stashedMsg(this, CStatusMessage::SeverityInfo, QString("Ready to auto stash %1 models").arg(autoStashed.size())); + const CStatusMessage stashedMsg(this, CStatusMessage::SeverityInfo, QStringLiteral("Ready to auto stash %1 models").arg(autoStashed.size())); this->addStatusMessage(stashedMsg); m_modelsToStash = autoStashed; m_state = Completed; diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 4617ceb1d..076c3c982 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -232,8 +232,7 @@ namespace BlackGui QString CDbOwnModelsComponent::directorySelector(const CSimulatorInfo &simulatorInfo) { QString dir = m_directorySettings.get().getLastModelDirectoryOrDefault(); - const QString text("Open directory (%1)"); - dir = QFileDialog::getExistingDirectory(this, text.arg(simulatorInfo.toQString()), dir, + dir = QFileDialog::getExistingDirectory(this, QStringLiteral("Open directory (%1)").arg(simulatorInfo.toQString()), dir, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); const QDir d(dir); if (d.exists()) diff --git a/src/blackgui/components/dbownmodelsetcomponent.cpp b/src/blackgui/components/dbownmodelsetcomponent.cpp index 0adb7fa67..25f065344 100644 --- a/src/blackgui/components/dbownmodelsetcomponent.cpp +++ b/src/blackgui/components/dbownmodelsetcomponent.cpp @@ -267,9 +267,8 @@ namespace BlackGui ui->pb_SaveAsSetForSimulator->setEnabled(canSave); if (canSave) { - static const QString ss("save %1"); this->setSaveFileName(this->getModelSetSimulator()); - ui->pb_SaveAsSetForSimulator->setText(ss.arg(this->getModelSetSimulator().toQString(true))); + ui->pb_SaveAsSetForSimulator->setText(QStringLiteral("save %1").arg(this->getModelSetSimulator().toQString(true))); } else { diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index 90db669fe..5bb2668cf 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/src/blackgui/components/dbstashcomponent.cpp @@ -283,7 +283,7 @@ namespace BlackGui if (validModels.size() > MaxModelPublished) { validModels.truncate(MaxModelPublished); - msgs.push_back(CStatusMessage(validationCategories(), CStatusMessage::SeverityWarning, QString("More than %1 values, values skipped").arg(MaxModelPublished))); + msgs.push_back(CStatusMessage(validationCategories(), CStatusMessage::SeverityWarning, QStringLiteral("More than %1 values, values skipped").arg(MaxModelPublished))); } msgs.push_back(sGui->getWebDataServices()->asyncPublishModels(validModels)); @@ -340,7 +340,7 @@ namespace BlackGui { return CStatusMessageList( { - CStatusMessage(validationCategories(), CStatusMessage::SeverityInfo, QString("No errors in %1 model(s)").arg(models.size())) + CStatusMessage(validationCategories(), CStatusMessage::SeverityInfo, QStringLiteral("No errors in %1 model(s)").arg(models.size())) }); } else diff --git a/src/blackgui/components/downloadcomponent.cpp b/src/blackgui/components/downloadcomponent.cpp index 59867697c..98f613fb2 100644 --- a/src/blackgui/components/downloadcomponent.cpp +++ b/src/blackgui/components/downloadcomponent.cpp @@ -303,10 +303,9 @@ namespace BlackGui void CDownloadComponent::showStartedFileMessage(const CRemoteFile &rf) { - static const QString of("%1/%2"); const int current = m_remoteFiles.size() - m_waitingForDownload.size(); ui->le_Started->setText(rf.getName()); - ui->le_StartedNumber->setText(of.arg(current).arg(m_remoteFiles.size())); + ui->le_StartedNumber->setText(QStringLiteral("%1/%2").arg(current).arg(m_remoteFiles.size())); ui->le_StartedUrl->setText(rf.getUrl().getFullUrl()); ui->prb_Total->setMaximum(m_remoteFiles.size()); ui->prb_Total->setValue(current - 1); @@ -314,10 +313,9 @@ namespace BlackGui void CDownloadComponent::showCompletedFileMessage(const CRemoteFile &rf) { - static const QString of("%1/%2"); const int current = m_remoteFiles.size() - m_waitingForDownload.size(); ui->le_Completed->setText(rf.getName()); - ui->le_CompletedNumber->setText(of.arg(current).arg(m_remoteFiles.size())); + ui->le_CompletedNumber->setText(QStringLiteral("%1/%2").arg(current).arg(m_remoteFiles.size())); ui->le_CompletedUrl->setText(rf.getUrl().getFullUrl()); ui->prb_Total->setMaximum(m_remoteFiles.size()); ui->prb_Total->setValue(current); @@ -336,8 +334,7 @@ namespace BlackGui void CDownloadComponent::showFileInfo() { - static const QString info("Files: %1 size: %2"); - ui->le_Info->setText(info.arg(m_remoteFiles.size()).arg(m_remoteFiles.getTotalFileSizeHumanReadable())); + ui->le_Info->setText(QStringLiteral("Files: %1 size: %2").arg(m_remoteFiles.size()).arg(m_remoteFiles.getTotalFileSizeHumanReadable())); } } // ns } // ns diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp index 3157a6cfc..0d18308d9 100644 --- a/src/blackgui/components/infobarstatuscomponent.cpp +++ b/src/blackgui/components/infobarstatuscomponent.cpp @@ -232,7 +232,7 @@ namespace BlackGui ui->led_MapperReady->setOn(on); if (on) { - const QString m = QString("Mapper with %1 models").arg(models); + const QString m = QStringLiteral("Mapper with %1 models").arg(models); ui->led_MapperReady->setToolTip(m); } } diff --git a/src/blackgui/components/interpolationlogdisplay.cpp b/src/blackgui/components/interpolationlogdisplay.cpp index 29e786907..8103ae607 100644 --- a/src/blackgui/components/interpolationlogdisplay.cpp +++ b/src/blackgui/components/interpolationlogdisplay.cpp @@ -189,9 +189,8 @@ namespace BlackGui void CInterpolationLogDisplay::onSliderChanged(int timeSecs) { - static const QString time("%1secs"); m_updateTimer.setInterval(timeSecs * 1000); - ui->le_UpdateTime->setText(time.arg(timeSecs)); + ui->le_UpdateTime->setText(QStringLiteral("%1secs").arg(timeSecs)); } void CInterpolationLogDisplay::onCallsignEntered() diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 918ca2b8d..a667f7c25 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -311,8 +311,7 @@ namespace BlackGui if (msg.isSuccess()) { Q_ASSERT_X(currentServer.isValidForLogin(), Q_FUNC_INFO, "invalid server"); - static const QString extraInfo("[%1]"); - sGui->setExtraWindowTitle(extraInfo.arg(ownAircraft.getCallsignAsString())); + sGui->setExtraWindowTitle(QStringLiteral("[%1]").arg(ownAircraft.getCallsignAsString())); sGui->crashAndLogInfoUserName(currentServer.getUser().getRealNameAndId()); sGui->crashAndLogInfoFlightNetwork(currentServer.getEcosystem().toQString(true)); sGui->crashAndLogAppendInfo(currentServer.getServerSessionId()); @@ -770,8 +769,7 @@ namespace BlackGui color = warning; } } - static const QString sheet("background-color: %1;"); - ui->le_SimulatorModel->setStyleSheet(sheet.arg(color)); + ui->le_SimulatorModel->setStyleSheet(QStringLiteral("background-color: %1;").arg(color)); } bool CLoginComponent::isVatsimNetworkTabSelected() const diff --git a/src/blackgui/components/rawfsdmessagescomponent.cpp b/src/blackgui/components/rawfsdmessagescomponent.cpp index e15520687..9c295228b 100644 --- a/src/blackgui/components/rawfsdmessagescomponent.cpp +++ b/src/blackgui/components/rawfsdmessagescomponent.cpp @@ -236,8 +236,7 @@ namespace BlackGui QString CRawFsdMessagesComponent::rawFsdMessageToString(const CRawFsdMessage &rawFsdMessage) { - static const QString s("%1 %2"); - return s.arg(rawFsdMessage.getFormattedUtcTimestampHmsz(), rawFsdMessage.getRawMessage()); + return QStringLiteral("%1 %2").arg(rawFsdMessage.getFormattedUtcTimestampHmsz(), rawFsdMessage.getRawMessage()); } } } // namespace diff --git a/src/blackgui/components/scalescreenfactor.cpp b/src/blackgui/components/scalescreenfactor.cpp index 9476c78d2..81b895357 100644 --- a/src/blackgui/components/scalescreenfactor.cpp +++ b/src/blackgui/components/scalescreenfactor.cpp @@ -35,10 +35,9 @@ namespace BlackGui ui->hs_Factor->setMaximum(max); ui->le_Factor->setValidator(new QIntValidator(min, max, ui->le_Factor)); - static const QString info("%1-%2"); - ui->le_Factor->setToolTip(info.arg(min).arg(max)); - ui->le_Factor->setPlaceholderText(info.arg(min).arg(max)); - ui->hs_Factor->setToolTip(info.arg(min, max)); + ui->le_Factor->setToolTip(QStringLiteral("%1-%2").arg(min).arg(max)); + ui->le_Factor->setPlaceholderText(QStringLiteral("%1-%2").arg(min).arg(max)); + ui->hs_Factor->setToolTip(QStringLiteral("%1-%2").arg(min, max)); const int v = (min + max) / 2; ui->hs_Factor->setValue(v); diff --git a/src/blackgui/components/settingshotkeycomponent.cpp b/src/blackgui/components/settingshotkeycomponent.cpp index 3a009d2cd..ba3038a1a 100644 --- a/src/blackgui/components/settingshotkeycomponent.cpp +++ b/src/blackgui/components/settingshotkeycomponent.cpp @@ -145,7 +145,7 @@ namespace BlackGui if (!conflicts.isEmpty()) { - QString message = QString("The selected combination conflicts with the following %1 combination(s):\n\n").arg(conflicts.size()); + QString message = QStringLiteral("The selected combination conflicts with the following %1 combination(s):\n\n").arg(conflicts.size()); for (const CActionHotkey &conflict : conflicts) { message += conflict.toQString(); diff --git a/src/blackgui/components/setuploadingdialog.cpp b/src/blackgui/components/setuploadingdialog.cpp index e422756a7..0fe013e11 100644 --- a/src/blackgui/components/setuploadingdialog.cpp +++ b/src/blackgui/components/setuploadingdialog.cpp @@ -183,7 +183,7 @@ namespace BlackGui void CSetupLoadingDialog::displayOtherVersionsInfo() { const int other = CDirectoryUtils::applicationDataDirectoriesCount() - 1 ; - ui->le_OtherSwiftVersions->setText(QString("There is/are %1 other swift version(s) installed").arg(other)); + ui->le_OtherSwiftVersions->setText(QStringLiteral("There is/are %1 other swift version(s) installed").arg(other)); ui->pb_CopyFromSwift->setEnabled(other > 0); } diff --git a/src/blackgui/components/transpondercodespinbox.cpp b/src/blackgui/components/transpondercodespinbox.cpp index 0bf808c41..a15bb196b 100644 --- a/src/blackgui/components/transpondercodespinbox.cpp +++ b/src/blackgui/components/transpondercodespinbox.cpp @@ -22,7 +22,7 @@ namespace BlackGui QString CTransponderCodeSpinBox::textFromValue(int value) const { /* 4 - number of digits, 10 - base of number, '0' - pad character*/ - return QString("%1").arg(value, 4 , 10, QChar('0')); + return QStringLiteral("%1").arg(value, 4 , 10, QChar('0')); } } // ns } // ns diff --git a/src/blackgui/copyxswiftbusdialog.cpp b/src/blackgui/copyxswiftbusdialog.cpp index cbea95ecf..f8d7771e7 100644 --- a/src/blackgui/copyxswiftbusdialog.cpp +++ b/src/blackgui/copyxswiftbusdialog.cpp @@ -41,8 +41,8 @@ namespace BlackGui const QMessageBox::StandardButton reply = QMessageBox::question(parent, "Copy XSwiftBus", - QString("Copy XSwiftBus from build directory '%1' to plugin directory '%2'?").arg(CDirectoryUtils::getXSwiftBusBuildDirectory(), CXPlaneUtil::xswiftbusPluginDir(xplaneRootDir)), - QMessageBox::Yes | QMessageBox::No); + QStringLiteral("Copy XSwiftBus from build directory '%1' to plugin directory '%2'?").arg(CDirectoryUtils::getXSwiftBusBuildDirectory(), CXPlaneUtil::xswiftbusPluginDir(xplaneRootDir)), + QMessageBox::Yes | QMessageBox::No); if (reply != QMessageBox::Yes) { return 0; } return CXPlaneUtil::copyXSwiftBusBuildFiles(xplaneRootDir); } // ns diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index c00f29743..243c69c8c 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -982,10 +982,9 @@ namespace BlackGui QString CGuiApplication::getFontInfo() const { - static const QString info("Family: '%1', average width: %2"); const QWidget *w = this->mainApplicationWidget(); if (!w) { return QStringLiteral("Font info not available"); } - return info. + return QStringLiteral("Family: '%1', average width: %2"). arg(w->font().family()). arg(w->fontMetrics().averageCharWidth()); } diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp index a7aeee975..d0fa04fd1 100644 --- a/src/blackgui/guiutility.cpp +++ b/src/blackgui/guiutility.cpp @@ -414,8 +414,7 @@ namespace BlackGui QString CGuiUtility::marginsToString(const QMargins &margins) { - const QString s("%1:%2:%3:%4"); - return s.arg(margins.left()).arg(margins.top()).arg(margins.right()).arg(margins.bottom()); + return QStringLiteral("%1:%2:%3:%4").arg(margins.left()).arg(margins.top()).arg(margins.right()).arg(margins.bottom()); } QMargins CGuiUtility::stringToMargins(const QString &str) @@ -580,8 +579,8 @@ namespace BlackGui { // const QSize sd = QApplication::desktop()->screenGeometry().size(); const QSize sd = QApplication::desktop()->screenGeometry(mainWidget).size(); - desktop = QString("Desktop w%1 w%2").arg(sd.width()).arg(sd.height()); - ratio = QString("ratio: %1").arg(mainWidget->devicePixelRatioF()); + desktop = QStringLiteral("Desktop w%1 w%2").arg(sd.width()).arg(sd.height()); + ratio = QStringLiteral("ratio: %1").arg(mainWidget->devicePixelRatioF()); } return s. arg(desktop). @@ -620,11 +619,8 @@ namespace BlackGui if (!icon.hasFileResourcePath()) return {}; const QString p = icon.getFileResourcePath(); - static const QString htmlNoWidth(""); - static const QString htmlWidth(""); - - if (width < 0) { return htmlNoWidth.arg(p); } - return htmlWidth.arg(p, QString::number(width)); + if (width < 0) { return QStringLiteral("").arg(p); } + return QStringLiteral("").arg(p, QString::number(width)); } QString CGuiUtility::asSimpleHtmlImageHeight(const CIcon &icon, int height) @@ -633,7 +629,6 @@ namespace BlackGui if (!icon.hasFileResourcePath()) return {}; const QString p = icon.getFileResourcePath(); - static const QString htmlHeight(""); - return htmlHeight.arg(p, QString::number(height)); + return QStringLiteral("").arg(p, QString::number(height)); } } // ns diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index ebd617a71..38e6912e6 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -87,7 +87,7 @@ namespace BlackGui { menu->addAction(CIcons::dockTop16(), "Dock all", this, &CInfoArea::dockAllWidgets); menu->addAction(CIcons::floatAll16(), "Float all", this, &CInfoArea::floatAllWidgets); - menu->addAction(CIcons::floatOne16(), QString("Dock / float '%1'").arg(this->windowTitle()), this, &CInfoArea::toggleFloatingWholeInfoArea); + menu->addAction(CIcons::floatOne16(), QStringLiteral("Dock / float '%1'").arg(this->windowTitle()), this, &CInfoArea::toggleFloatingWholeInfoArea); QAction *lockTabBarMenuAction = new QAction(menu); lockTabBarMenuAction->setObjectName(this->objectName().append("LockTabBar")); lockTabBarMenuAction->setIconText("Lock tab bar"); @@ -217,8 +217,7 @@ namespace BlackGui action->setObjectName(this->objectName().append(":getInfoAreaSelectActions:").append(wt)); if (withShortcut && i < keys.length()) { - static const QString ks("Ctrl+%1"); // Qt::CTRL - action->setShortcut(QKeySequence(ks.arg(keys.at(i)))); + action->setShortcut(QKeySequence(QStringLiteral("Ctrl+%1").arg(keys.at(i)))); } connect(action, &QAction::triggered, this, &CInfoArea::selectAreaByAction); diff --git a/src/blackgui/models/columnformatters.cpp b/src/blackgui/models/columnformatters.cpp index e0f124b7c..fc0f61e8d 100644 --- a/src/blackgui/models/columnformatters.cpp +++ b/src/blackgui/models/columnformatters.cpp @@ -268,8 +268,7 @@ namespace BlackGui { if (dataCVariant.canConvert()) { return dataCVariant; } if (!dataCVariant.isValid()) { static const CVariant iv("invalid"); return iv; } - static const QString s("Invalid type: '%1'"); - return CVariant::from(s.arg(dataCVariant.typeName())); + return CVariant::from(QStringLiteral("Invalid type: '%1'").arg(dataCVariant.typeName())); } Qt::ItemFlags CDelegateFormatter::flags(Qt::ItemFlags flags, bool editable) const diff --git a/src/blackgui/settings/guisettings.cpp b/src/blackgui/settings/guisettings.cpp index 7f6c54f3c..bc74aa09a 100644 --- a/src/blackgui/settings/guisettings.cpp +++ b/src/blackgui/settings/guisettings.cpp @@ -48,8 +48,7 @@ namespace BlackGui QString CGeneralGuiSettings::convertToQString(bool i18n) const { Q_UNUSED(i18n); - static const QString s("Widget style: %1"); - return s.arg(this->m_widgetStyle); + return QStringLiteral("Widget style: %1").arg(this->m_widgetStyle); } BlackMisc::CVariant CGeneralGuiSettings::propertyByIndex(const BlackMisc::CPropertyIndex &index) const diff --git a/src/blackgui/settings/textmessagesettings.cpp b/src/blackgui/settings/textmessagesettings.cpp index 476cfe046..e60f1d37b 100644 --- a/src/blackgui/settings/textmessagesettings.cpp +++ b/src/blackgui/settings/textmessagesettings.cpp @@ -65,8 +65,7 @@ namespace BlackGui QString CTextMessageSettings::convertToQString(bool i18n) const { Q_UNUSED(i18n); - static const QString s("Private: %1 supervisor: %2 frequency: %3 all: %4"); - return s.arg( + return QStringLiteral("Private: %1 supervisor: %2 frequency: %3 all: %4").arg( boolToOnOff(this->getPopupPrivateMessages()), boolToOnOff(this->getPopupSupervisorMessages()), boolToOnOff(this->getPopupFrequencyMessages()), diff --git a/src/blackgui/shortcut.cpp b/src/blackgui/shortcut.cpp index 9279db2d0..72ef82613 100644 --- a/src/blackgui/shortcut.cpp +++ b/src/blackgui/shortcut.cpp @@ -103,7 +103,6 @@ namespace BlackGui const QString CShortcut::toParenthesisString(const QKeySequence &sequence) { - static const QString s("(%1)"); - return s.arg(sequence.toString()); + return QStringLiteral("(%1)").arg(sequence.toString()); } } // ns diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index 739b22aeb..1c91c135b 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -116,7 +116,7 @@ namespace BlackGui const QFont f = widget->font(); return CStyleSheetUtility::asStylesheet( f.family(), - QString("%1pt").arg(pointSize < 0 ? f.pointSize() : pointSize), + QStringLiteral("%1pt").arg(pointSize < 0 ? f.pointSize() : pointSize), CStyleSheetUtility::fontStyleAsString(f), CStyleSheetUtility::fontWeightAsString(f) ); diff --git a/src/blackgui/views/viewbasenontemplate.cpp b/src/blackgui/views/viewbasenontemplate.cpp index a3f5a817b..b98d886bf 100644 --- a/src/blackgui/views/viewbasenontemplate.cpp +++ b/src/blackgui/views/viewbasenontemplate.cpp @@ -790,7 +790,7 @@ namespace BlackGui if (dockWidget) { if (!menu.isEmpty()) { menu.addSeparator(); } - const QString mm = QString("Dock widget '%1'").arg(dockWidget->windowTitleOrBackup()); + const QString mm = QStringLiteral("Dock widget '%1'").arg(dockWidget->windowTitleOrBackup()); QMenu *dockWidgetSubMenu = menu.addMenu(CIcons::text16(), mm); dockWidget->addToContextMenu(dockWidgetSubMenu); } diff --git a/src/blackmisc/atomicfile.cpp b/src/blackmisc/atomicfile.cpp index 6b63e3ab1..b524ba9fd 100644 --- a/src/blackmisc/atomicfile.cpp +++ b/src/blackmisc/atomicfile.cpp @@ -117,7 +117,7 @@ namespace BlackMisc QString CAtomicFile::randomSuffix() { constexpr auto max = 2176782335; - return QString("%1").arg(std::uniform_int_distribution>(0, max)(Private::defaultRandomGenerator()), 6, 36, QChar('0')); + return QStringLiteral("%1").arg(std::uniform_int_distribution>(0, max)(Private::defaultRandomGenerator()), 6, 36, QChar('0')); } #if defined(Q_OS_POSIX) diff --git a/src/blackmisc/audio/voicesetup.cpp b/src/blackmisc/audio/voicesetup.cpp index 6b415cdf4..09416d797 100644 --- a/src/blackmisc/audio/voicesetup.cpp +++ b/src/blackmisc/audio/voicesetup.cpp @@ -23,8 +23,7 @@ namespace BlackMisc QString CVoiceSetup::convertToQString(bool i18n) const { Q_UNUSED(i18n); - static const QString s("Port: %1"); - return s.arg(getVatsimUdpVoicePort()); + return QStringLiteral("Port: %1").arg(getVatsimUdpVoicePort()); } CStatusMessageList CVoiceSetup::validate() const diff --git a/src/blackmisc/aviation/aircraftengine.cpp b/src/blackmisc/aviation/aircraftengine.cpp index 898f163b8..294b2fa99 100644 --- a/src/blackmisc/aviation/aircraftengine.cpp +++ b/src/blackmisc/aviation/aircraftengine.cpp @@ -31,8 +31,7 @@ namespace BlackMisc QString CAircraftEngine::convertToQString(bool i18n) const { Q_UNUSED(i18n); - static const QString s("%1: %2"); - return s.arg(m_number).arg(BlackMisc::boolToOnOff(m_on)); + return QStringLiteral("%1: %2").arg(m_number).arg(BlackMisc::boolToOnOff(m_on)); } } // namespace } // namespace diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index 1bbe48a6b..4c4988819 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -82,8 +82,7 @@ namespace BlackMisc QString CAircraftIcaoCode::convertToQString(bool i18n) const { Q_UNUSED(i18n); - static const QString s("%1 %2 %3"); - return s.arg(this->getDesignatorDbKey(), this->getCombinedType(), this->getWtc()).trimmed(); + return QStringLiteral("%1 %2 %3").arg(this->getDesignatorDbKey(), this->getCombinedType(), this->getWtc()).trimmed(); } void CAircraftIcaoCode::updateMissingParts(const CAircraftIcaoCode &otherIcaoCode) @@ -143,8 +142,7 @@ namespace BlackMisc score += 50; // same designator if (log) { - static const QString s("Same designator: %1"); - CMatchingUtils::addLogDetailsToList(log, *this, s.arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Same designator: %1").arg(score)); } int scoreOld = score; @@ -153,30 +151,27 @@ namespace BlackMisc else if (this->getRank() < 10) { score += (10 - this->getRank()); } if (score > scoreOld) { - static const QString s("Added rank: %1"); - CMatchingUtils::addLogDetailsToList(log, *this, s.arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Added rank: %1").arg(score)); } } else { if (this->hasFamily() && this->getFamily() == otherCode.getFamily()) { - static const QString s("Added family: %1"); score += 30; - CMatchingUtils::addLogDetailsToList(log, *this, s.arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Added family: %1").arg(score)); } else if (this->hasValidCombinedType() && otherCode.getCombinedType() == this->getCombinedType()) { - static const QString s("Added combined code: %1"); score += 20; - CMatchingUtils::addLogDetailsToList(log, *this, s.arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Added combined code: %1").arg(score)); } else if (this->hasValidCombinedType()) { if (this->getEnginesCount() == otherCode.getEnginesCount()) { score += 2; } if (this->getEngineType() == otherCode.getEngineType()) { score += 2; } if (this->getAircraftType() == otherCode.getAircraftType()) { score += 2; } - CMatchingUtils::addLogDetailsToList(log, *this, QString("Added combined code parts: %1").arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Added combined code parts: %1").arg(score)); } } @@ -185,14 +180,12 @@ namespace BlackMisc { if (this->matchesManufacturer(otherCode.getManufacturer())) { - static const QString s("Matches manufacturer '%1': %2"); score += 10; - CMatchingUtils::addLogDetailsToList(log, *this, s.arg(this->getManufacturer()).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Matches manufacturer '%1': %2").arg(this->getManufacturer()).arg(score)); } else if (this->getManufacturer().contains(otherCode.getManufacturer(), Qt::CaseInsensitive)) { - static const QString s("Contains manufacturer '%1': %2"); - CMatchingUtils::addLogDetailsToList(log, *this, s.arg(this->getManufacturer()).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Contains manufacturer '%1': %2").arg(this->getManufacturer()).arg(score)); score += 5; } } @@ -200,9 +193,8 @@ namespace BlackMisc // 0..75 so far if (this->isMilitary() == otherCode.isMilitary()) { - static const QString s("Matches military flag '%1': %2"); score += 10; - CMatchingUtils::addLogDetailsToList(log, *this, s.arg(boolToYesNo(this->isMilitary())).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Matches military flag '%1': %2").arg(boolToYesNo(this->isMilitary())).arg(score)); } // 0..85 return score; diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index 2bd87dba1..247fd46ac 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -1030,8 +1030,7 @@ namespace BlackMisc QString CAircraftSituation::getPBHInfo() const { - static const QString pbh("P: %1 %2 B: %3 %4 H: %5 %6"); - return pbh.arg( + return QStringLiteral("P: %1 %2 B: %3 %4 H: %5 %6").arg( this->getPitch().valueRoundedWithUnit(CAngleUnit::deg(), 1, true), this->getPitch().valueRoundedWithUnit(CAngleUnit::rad(), 5, true), this->getBank().valueRoundedWithUnit(CAngleUnit::deg(), 1, true), this->getBank().valueRoundedWithUnit(CAngleUnit::rad(), 5, true), this->getHeading().valueRoundedWithUnit(CAngleUnit::deg(), 1, true), this->getHeading().valueRoundedWithUnit(CAngleUnit::rad(), 5, true) diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index 07919d36a..a42be3ead 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -379,31 +379,31 @@ namespace BlackMisc if (otherCode.hasValidDesignator() && this->getDesignator() == otherCode.getDesignator()) { score += 60; - CMatchingUtils::addLogDetailsToList(log, *this, QString("Same designator: %1").arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Same designator: %1").arg(score)); } // only for DB values we check VA if (bothFromDb && this->isVirtualAirline() == otherCode.isVirtualAirline()) { score += 20; - CMatchingUtils::addLogDetailsToList(log, *this, QString("VA equality: %1").arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("VA equality: %1").arg(score)); } // consider the various names if (this->hasName() && this->getName() == otherCode.getName()) { score += 20; - CMatchingUtils::addLogDetailsToList(log, *this, QString("Same name '%1': %2").arg(this->getName()).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Same name '%1': %2").arg(this->getName()).arg(score)); } else if (this->hasTelephonyDesignator() && this->getTelephonyDesignator() == otherCode.getTelephonyDesignator()) { score += 15; - CMatchingUtils::addLogDetailsToList(log, *this, QString("Same telephony '%1': %2").arg(this->getTelephonyDesignator()).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Same telephony '%1': %2").arg(this->getTelephonyDesignator()).arg(score)); } else if (this->hasSimplifiedName() && this->getSimplifiedName() == otherCode.getSimplifiedName()) { score += 10; - CMatchingUtils::addLogDetailsToList(log, *this, QString("Same simplified name '%1': %2").arg(this->getSimplifiedName()).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Same simplified name '%1': %2").arg(this->getSimplifiedName()).arg(score)); } return score; } diff --git a/src/blackmisc/aviation/altitude.cpp b/src/blackmisc/aviation/altitude.cpp index a82e286a8..b27c4e438 100644 --- a/src/blackmisc/aviation/altitude.cpp +++ b/src/blackmisc/aviation/altitude.cpp @@ -78,9 +78,8 @@ namespace BlackMisc if (m_datum == FlightLevel) { - static const QString fls("FL%1"); const int fl = qRound(this->CLength::value(CLengthUnit::ft()) / 100.0); - return fls.arg(fl); + return QStringLiteral("FL%1").arg(fl); } else { diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp index 05c2f066f..c44046819 100644 --- a/src/blackmisc/aviation/flightplan.cpp +++ b/src/blackmisc/aviation/flightplan.cpp @@ -503,7 +503,7 @@ namespace BlackMisc { if (msgs) { - msgs->push_back(ex.toStatusMessage(getLogCategories(), QString("Parsing flight plan from '%1' failed.").arg(fileName))); + msgs->push_back(ex.toStatusMessage(getLogCategories(), QStringLiteral("Parsing flight plan from '%1' failed.").arg(fileName))); } } return CFlightPlan(); diff --git a/src/blackmisc/aviation/heading.cpp b/src/blackmisc/aviation/heading.cpp index 2a36f50ac..fb5541ec5 100644 --- a/src/blackmisc/aviation/heading.cpp +++ b/src/blackmisc/aviation/heading.cpp @@ -20,13 +20,12 @@ namespace BlackMisc { QString CHeading::convertToQString(bool i18n) const { - static const QString s("%1 %2"); return i18n ? - s.arg(CAngle::convertToQString(i18n), + QStringLiteral("%1 %2").arg(CAngle::convertToQString(i18n), this->isMagneticHeading() ? QCoreApplication::translate("Aviation", "magnetic") : QCoreApplication::translate("Aviation", "true")) : - s.arg(CAngle::convertToQString(i18n), + QStringLiteral("%1 %2").arg(CAngle::convertToQString(i18n), this->isMagneticHeading() ? "magnetic" : "true"); } diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index 601b44404..357097ed1 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -429,8 +429,7 @@ namespace BlackMisc QString CLivery::asHtmlSummary(const QString &separator) const { - static const QString html = "%1%2Airline: %3"; - return html.arg( + return QStringLiteral("%1%2Airline: %3").arg( this->getCombinedCodePlusInfoAndId(), separator, this->getAirlineIcaoCode().getDesignator().isEmpty() ? "No airline" : this->getAirlineIcaoCode().getCombinedStringWithKey() ).replace(" ", " "); @@ -456,7 +455,7 @@ namespace BlackMisc // 2 color liveries 25..85 score = 25; score += 60 * colorMultiplier; - CMatchingUtils::addLogDetailsToList(log, *this, QString("2 color liveries, color multiplier %1: %2").arg(colorMultiplier).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("2 color liveries, color multiplier %1: %2").arg(colorMultiplier).arg(score)); } else if (this->isAirlineLivery() && otherLivery.isAirlineLivery()) { @@ -467,10 +466,10 @@ namespace BlackMisc // same ICAO at least means 30, max 50 score = qRound(0.5 * this->getAirlineIcaoCode().calculateScore(otherLivery.getAirlineIcaoCode(), log)); score += 25 * colorMultiplier; - CMatchingUtils::addLogDetailsToList(log, *this, QString("2 airline liveries, color multiplier %1: %2").arg(colorMultiplier).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("2 airline liveries, color multiplier %1: %2").arg(colorMultiplier).arg(score)); if (this->isMilitary() == otherLivery.isMilitary()) { - CMatchingUtils::addLogDetailsToList(log, *this, QString("Mil.flag '%1' matches: %2").arg(boolToYesNo(this->isMilitary())).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Mil.flag '%1' matches: %2").arg(boolToYesNo(this->isMilitary())).arg(score)); score += 10; } } @@ -481,7 +480,7 @@ namespace BlackMisc // 25 is weaker as same ICAO code / 2 from above score = preferColorLiveries ? 25 : 0; score += 25 * colorMultiplier; // needs to be the same as in 2 airlines - CMatchingUtils::addLogDetailsToList(log, *this, QString("Color/airline mixed, color multiplier %1: %2").arg(colorMultiplier).arg(score)); + CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Color/airline mixed, color multiplier %1: %2").arg(colorMultiplier).arg(score)); } return score; } diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp index abb6779e9..93cbb5eae 100644 --- a/src/blackmisc/datacache.cpp +++ b/src/blackmisc/datacache.cpp @@ -262,7 +262,7 @@ namespace BlackMisc } CDataCacheSerializer::CDataCacheSerializer(CDataCache *owner, const QString &revisionFileName) : - CContinuousWorker(owner, QString("CDataCacheSerializer '%1'").arg(revisionFileName)), + CContinuousWorker(owner, QStringLiteral("CDataCacheSerializer '%1'").arg(revisionFileName)), m_cache(owner), m_revisionFileName(revisionFileName) {} diff --git a/src/blackmisc/db/dbinfo.cpp b/src/blackmisc/db/dbinfo.cpp index 71cce8324..18c417cff 100644 --- a/src/blackmisc/db/dbinfo.cpp +++ b/src/blackmisc/db/dbinfo.cpp @@ -68,8 +68,7 @@ namespace BlackMisc QString CDbInfo::convertToQString(bool i18n) const { Q_UNUSED(i18n); - QString s("Table %1 with entries %1"); - return s.arg(this->m_tableName).arg(this->m_entries); + return QStringLiteral("Table %1 with entries %1").arg(this->m_tableName).arg(this->m_entries); } CVariant CDbInfo::propertyByIndex(const BlackMisc::CPropertyIndex &index) const diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp index 41ac2f574..da87fd4a1 100644 --- a/src/blackmisc/dbusserver.cpp +++ b/src/blackmisc/dbusserver.cpp @@ -398,7 +398,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, p); + return QStringLiteral("tcp:host=%1,port=%2").arg(h, p); } const QString &CDBusServer::p2pConnectionName() diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp index 07ee677a9..4850726d2 100644 --- a/src/blackmisc/fileutils.cpp +++ b/src/blackmisc/fileutils.cpp @@ -455,8 +455,7 @@ namespace BlackMisc if (!win) { return filePath; } if (!filePath.startsWith('/')) { return filePath; } if (filePath.startsWith("//")) { return filePath; } - static const QString f("/%1"); - return f.arg(filePath); + return QStringLiteral("/%1").arg(filePath); } QStringList CFileUtils::fixWindowsUncPaths(const QStringList &filePaths) @@ -546,7 +545,7 @@ namespace BlackMisc unit = i.next(); currentSize /= 1024.0; } - return QString("%1 %2").arg(CMathUtils::roundAsString(currentSize, 2), unit); + return QStringLiteral("%1 %2").arg(CMathUtils::roundAsString(currentSize, 2), unit); } const QStringList &CFileUtils::executableSuffixes() diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index 659ef0bcb..594726904 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -175,10 +175,9 @@ namespace BlackMisc QString ICoordinateGeodetic::convertToQString(bool i18n) const { - static const QString s = "Geodetic: {%1/%2, %3/%4, %5}"; const CLatitude lat = this->latitude(); const CLongitude lng = this->longitude(); - return s.arg(lat.valueRoundedWithUnit(CAngleUnit::deg(), 6, i18n), + return QStringLiteral("Geodetic: {%1/%2, %3/%4, %5}").arg(lat.valueRoundedWithUnit(CAngleUnit::deg(), 6, i18n), lat.valueRoundedWithUnit(CAngleUnit::rad(), 6, i18n), lng.valueRoundedWithUnit(CAngleUnit::deg(), 6, i18n), lng.valueRoundedWithUnit(CAngleUnit::rad(), 6, i18n), diff --git a/src/blackmisc/geo/elevationplane.cpp b/src/blackmisc/geo/elevationplane.cpp index f0a8d9732..31ca729e8 100644 --- a/src/blackmisc/geo/elevationplane.cpp +++ b/src/blackmisc/geo/elevationplane.cpp @@ -21,9 +21,8 @@ namespace BlackMisc { QString CElevationPlane::convertToQString(bool i18n) const { - static const QString s = "%1 radius: %2"; const QString coordinate = CCoordinateGeodetic::toQString(i18n); - return s.arg(coordinate, m_radius.valueRoundedWithUnit(2, i18n)); + return QStringLiteral("%1 radius: %2").arg(coordinate, m_radius.valueRoundedWithUnit(2, i18n)); } CElevationPlane::CElevationPlane(const ICoordinateGeodetic &coordinate, const ICoordinateGeodetic &rangeCoordinate) : diff --git a/src/blackmisc/input/joystickbutton.cpp b/src/blackmisc/input/joystickbutton.cpp index 4aac857a8..cf356b307 100644 --- a/src/blackmisc/input/joystickbutton.cpp +++ b/src/blackmisc/input/joystickbutton.cpp @@ -78,7 +78,7 @@ namespace BlackMisc QString CJoystickButton::buttonIndexToString(qint32 buttonIndex) { QString buttonString("Button"); - return buttonString.append(QString("%1").arg(buttonIndex)); + return buttonString.append(QStringLiteral("%1").arg(buttonIndex)); } int CJoystickButton::buttonIndexFromString(const QString &buttonName) diff --git a/src/blackmisc/jsonexception.cpp b/src/blackmisc/jsonexception.cpp index 3f3649a8c..76b32246a 100644 --- a/src/blackmisc/jsonexception.cpp +++ b/src/blackmisc/jsonexception.cpp @@ -35,10 +35,8 @@ namespace BlackMisc QString CJsonException::toString(const QString &prefix) const { - static const QString s("%1 in '%2'"); - static const QString sp("%1: %2 in '%3'"); - if (prefix.isEmpty()) { return s.arg(what()).arg(getStackTrace()); } - return sp.arg(prefix).arg(what()).arg(getStackTrace()); + if (prefix.isEmpty()) { return QStringLiteral("%1 in '%2'").arg(what()).arg(getStackTrace()); } + return QStringLiteral("%1: %2 in '%3'").arg(prefix).arg(what()).arg(getStackTrace()); } void CJsonException::toLogMessage(const CLogCategoryList &categories, const QString &prefix) const diff --git a/src/blackmisc/network/rawfsdmessage.cpp b/src/blackmisc/network/rawfsdmessage.cpp index ecc6161e1..708fc98e4 100644 --- a/src/blackmisc/network/rawfsdmessage.cpp +++ b/src/blackmisc/network/rawfsdmessage.cpp @@ -30,8 +30,7 @@ namespace BlackMisc QString CRawFsdMessage::convertToQString(bool i18n) const { Q_UNUSED(i18n); - static const QString s("%1 %2"); - return s.arg(this->getFormattedUtcTimestampHmsz(), m_rawMessage); + return QStringLiteral("%1 %2").arg(this->getFormattedUtcTimestampHmsz(), m_rawMessage); } bool CRawFsdMessage::isPacketType(const QString &type) const diff --git a/src/blackmisc/network/remotefile.cpp b/src/blackmisc/network/remotefile.cpp index cfa530d3b..f90910fb8 100644 --- a/src/blackmisc/network/remotefile.cpp +++ b/src/blackmisc/network/remotefile.cpp @@ -31,8 +31,7 @@ namespace BlackMisc QString CRemoteFile::getNameAndSize() const { if (!this->hasName()) { return {}; } - static const QString s("%1 (%2)"); - return s.arg(this->getName(), this->getSizeHumanReadable()); + return QStringLiteral("%1 (%2)").arg(this->getName(), this->getSizeHumanReadable()); } bool CRemoteFile::matchesName(const QString &name) const diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp index 1e3dff49a..d521093e5 100644 --- a/src/blackmisc/network/server.cpp +++ b/src/blackmisc/network/server.cpp @@ -57,8 +57,7 @@ namespace BlackMisc QString CServer::convertToQString(bool i18n) const { - static const QString str("%1 %2 %3:%4 %5 %6 accepting: %7 FSD: %8 con.since: %9"); - return str. + return QStringLiteral("%1 %2 %3:%4 %5 %6 accepting: %7 FSD: %8 con.since: %9"). arg(m_name, m_description, m_address).arg(m_port). arg(m_user.toQString(i18n), m_ecosystem.getSystemString(), boolToYesNo(m_isAcceptingConnections), m_fsdSetup.toQString(i18n), this->isConnected() ? this->getFormattedUtcTimestampHms() : "not con."); diff --git a/src/blackmisc/network/urllist.cpp b/src/blackmisc/network/urllist.cpp index 19a660093..db4aa42ee 100644 --- a/src/blackmisc/network/urllist.cpp +++ b/src/blackmisc/network/urllist.cpp @@ -196,7 +196,7 @@ namespace BlackMisc { if (!msg.isEmpty()) { - m_errorMsgs.append(QString("URL: %1 error: %2").arg(url.toQString(), msg)); + m_errorMsgs.append(QStringLiteral("URL: %1 error: %2").arg(url.toQString(), msg)); } return obtainNextWorkingUrl(random, connectTimeoutMs); } diff --git a/src/blackmisc/network/urlloglist.cpp b/src/blackmisc/network/urlloglist.cpp index 4e280d3e5..06e4e6467 100644 --- a/src/blackmisc/network/urlloglist.cpp +++ b/src/blackmisc/network/urlloglist.cpp @@ -148,8 +148,7 @@ namespace BlackMisc QString CUrlLogList::getSummary() const { static const QString s("Entries: %1, pending: %2, errors: %3, min: %4ms avg: %5ms max: %6ms"); - static const QString e("No data"); - if (this->isEmpty()) return e; + if (this->isEmpty()) return QStringLiteral("No data"); return s.arg(this->size()).arg(this->sizePending()).arg(this->sizeErrors()).arg(this->getMinResponseTime()).arg(this->getAverageResponseTime()).arg(this->getMaxResponseTime()); } } // namespace diff --git a/src/blackmisc/nullable.cpp b/src/blackmisc/nullable.cpp index 2105d1828..fb80575d6 100644 --- a/src/blackmisc/nullable.cpp +++ b/src/blackmisc/nullable.cpp @@ -38,7 +38,7 @@ namespace BlackMisc break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return CVariant::fromValue(m); } @@ -57,7 +57,7 @@ namespace BlackMisc break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); } diff --git a/src/blackmisc/orderable.cpp b/src/blackmisc/orderable.cpp index a9aff98c2..107867566 100644 --- a/src/blackmisc/orderable.cpp +++ b/src/blackmisc/orderable.cpp @@ -53,7 +53,7 @@ namespace BlackMisc default: break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return CVariant::fromValue(m); } @@ -71,7 +71,7 @@ namespace BlackMisc break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); } diff --git a/src/blackmisc/pq/time.cpp b/src/blackmisc/pq/time.cpp index 73ab2b0da..32040076b 100644 --- a/src/blackmisc/pq/time.cpp +++ b/src/blackmisc/pq/time.cpp @@ -128,14 +128,14 @@ namespace BlackMisc QString CTime::formattedHrsMinSec() const { const QList parts = getHrsMinSecParts(); - const QString h = QString("00%1").arg(QString::number(parts.at(0))).right(2); - const QString m = QString("00%1").arg(QString::number(parts.at(1))).right(2); - const QString s = QString("00%1").arg(QString::number(parts.at(2))).right(2); + const QString h = QStringLiteral("00%1").arg(QString::number(parts.at(0))).right(2); + const QString m = QStringLiteral("00%1").arg(QString::number(parts.at(1))).right(2); + const QString s = QStringLiteral("00%1").arg(QString::number(parts.at(2))).right(2); const QString fs = QStringLiteral("%1:%2:%3").arg(h, m, s); if (this->isNegativeWithEpsilonConsidered()) { - return QString("-").append(fs); + return QStringLiteral("-").append(fs); } else { @@ -158,9 +158,9 @@ namespace BlackMisc QString CTime::formattedHrsMin() const { const QList parts = getHrsMinSecParts(); - const QString h = QString("00%1").arg(QString::number(parts.at(0))).right(2); - const QString m = QString("00%1").arg(QString::number(parts.at(1))).right(2); - const QString fs = QString("%1:%2").arg(h, m); + const QString h = QStringLiteral("00%1").arg(QString::number(parts.at(0))).right(2); + const QString m = QStringLiteral("00%1").arg(QString::number(parts.at(1))).right(2); + const QString fs = QStringLiteral("%1:%2").arg(h, m); if (this->isNegativeWithEpsilonConsidered()) { return QString("-").append(fs); diff --git a/src/blackmisc/processinfo.cpp b/src/blackmisc/processinfo.cpp index 65b0d5b38..3e55e88e6 100644 --- a/src/blackmisc/processinfo.cpp +++ b/src/blackmisc/processinfo.cpp @@ -27,13 +27,13 @@ namespace BlackMisc QString CProcessInfo::convertToQString(bool) const { - return QString("{ %1, %2 }").arg(QString::number(m_pid), m_name); + return QStringLiteral("{ %1, %2 }").arg(QString::number(m_pid), m_name); } #if defined(Q_OS_LINUX) QString CProcessInfo::processNameFromId(qint64 pid) { - QString path = QFileInfo(QString("/proc/%1/exe").arg(pid)).symLinkTarget(); + QString path = QFileInfo(QStringLiteral("/proc/%1/exe").arg(pid)).symLinkTarget(); return QFileInfo(path).fileName(); } #elif defined(Q_OS_MACOS) diff --git a/src/blackmisc/propertyindexvariantmap.cpp b/src/blackmisc/propertyindexvariantmap.cpp index 5a4e78897..1da306eaf 100644 --- a/src/blackmisc/propertyindexvariantmap.cpp +++ b/src/blackmisc/propertyindexvariantmap.cpp @@ -51,7 +51,7 @@ namespace BlackMisc QString CPropertyIndexVariantMap::convertToQString(bool i18n) const { - if (this->isEmpty()) return QString("{wildcard: %1}").arg(m_wildcard ? "true" : "false"); + if (this->isEmpty()) return QStringLiteral("{wildcard: %1}").arg(m_wildcard ? "true" : "false"); QString s; for (const CPropertyIndex &index : makeKeysRange(m_values)) { diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index cb9953b6c..32adad5bd 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -128,8 +128,7 @@ namespace BlackMisc QString CAircraftModel::asHtmlSummary(const QString &separator) const { - static const QString html = "Model: %1 changed: %2%3Simulator: %4 Mode: %5 Distributor: %6%7Aircraft ICAO: %8%9Livery: %10"; - return html + return QStringLiteral("Model: %1 changed: %2%3Simulator: %4 Mode: %5 Distributor: %6%7Aircraft ICAO: %8%9Livery: %10") .arg(this->getModelStringAndDbKey(), this->getFormattedUtcTimestampYmdhms(), separator, this->getSimulator().toQString(true), this->getModelModeAsString(), this->getDistributor().getIdAndDescription(), separator, this->getAircraftIcaoCode().asHtmlSummary(), separator) @@ -701,7 +700,7 @@ namespace BlackMisc { const int icaoScore = this->getAircraftIcaoCode().calculateScore(compareModel.getAircraftIcaoCode(), log); const int liveryScore = this->getLivery().calculateScore(compareModel.getLivery(), preferColorLiveries, log); - CMatchingUtils::addLogDetailsToList(log, this->getCallsign(), QString("ICAO score: %1 | livery score: %2").arg(icaoScore).arg(liveryScore)); + CMatchingUtils::addLogDetailsToList(log, this->getCallsign(), QStringLiteral("ICAO score: %1 | livery score: %2").arg(icaoScore).arg(liveryScore)); return qRound(0.5 * (icaoScore + liveryScore)); } diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 5c92c8ac3..d30eeaa48 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -973,8 +973,8 @@ namespace BlackMisc ScoredModels scoreMap; // normally prefer colors if there is no airline - CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QString("Prefer color liveries: '%1', airline: '%2', ignore zero scores: '%3'").arg(boolToYesNo(preferColorLiveries), remoteModel.getAirlineIcaoCodeDesignator(), boolToYesNo(ignoreZeroScores))); - CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QString("--- Start scoring in list with %1 models").arg(this->size())); + CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QStringLiteral("Prefer color liveries: '%1', airline: '%2', ignore zero scores: '%3'").arg(boolToYesNo(preferColorLiveries), remoteModel.getAirlineIcaoCodeDesignator(), boolToYesNo(ignoreZeroScores))); + CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QStringLiteral("--- Start scoring in list with %1 models").arg(this->size())); CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), this->coverageSummaryForModel(remoteModel)); int c = 1; @@ -984,11 +984,9 @@ namespace BlackMisc const int score = model.calculateScore(remoteModel, preferColorLiveries, log ? &subMsgs : nullptr); if (ignoreZeroScores && score < 1) { continue; } - static const QString bMsg("--- Calculating #%1 '%2'---"); - static const QString eMsg("--- End calculating #%1 ---"); - CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), bMsg.arg(c).arg(model.getModelStringAndDbKey())); + CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QStringLiteral("--- Calculating #%1 '%2'---").arg(c).arg(model.getModelStringAndDbKey())); if (log) { log->push_back(subMsgs); } - CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), eMsg.arg(c)); + CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QStringLiteral("--- End calculating #%1 ---").arg(c)); c++; scoreMap.insertMulti(score, model); } diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp index 7116c89da..7349c5d26 100644 --- a/src/blackmisc/simulation/distributor.cpp +++ b/src/blackmisc/simulation/distributor.cpp @@ -120,7 +120,7 @@ namespace BlackMisc QString CDistributor::convertToQString(bool i18n) const { Q_UNUSED(i18n); - QString s = QString("Id: '%1'").arg(m_dbKey); + QString s = QStringLiteral("Id: '%1'").arg(m_dbKey); if (this->hasAlias1()) { s.append(" ").append(m_alias1); } if (this->hasAlias2()) { s.append(" ").append(m_alias2); } return s; diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp index fd031d2af..5a9f7aacd 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp @@ -38,9 +38,7 @@ namespace BlackMisc QString CAircraftCfgEntries::convertToQString(bool) const { - static const QString s = "{%1, %2, %3, %4, %5, %6}"; - return s. - arg(m_fileName).arg(m_index). + return QStringLiteral("{%1, %2, %3, %4, %5, %6}").arg(m_fileName).arg(m_index). arg(m_title, m_atcModel, m_atcType, m_atcParkingCode); } diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp index 3486f6d58..7af36f214 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp +++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp @@ -366,7 +366,7 @@ namespace BlackMisc messages.clear(); if (!CDirectoryUtils::existsUnemptyDirectory(CDirectoryUtils::shareTerrainProbeDirectory())) { - messages.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, QString("No terrain probe source files in '%1'").arg(CDirectoryUtils::shareTerrainProbeDirectory()))); + messages.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, QStringLiteral("No terrain probe source files in '%1'").arg(CDirectoryUtils::shareTerrainProbeDirectory()))); return -1; } @@ -380,7 +380,7 @@ namespace BlackMisc QDir td(targetDir); if (!td.exists()) { - messages.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, QString("Cannot access target directory '%1'").arg(targetDir))); + messages.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, QStringLiteral("Cannot access target directory '%1'").arg(targetDir))); return -1; } @@ -389,12 +389,12 @@ namespace BlackMisc const bool hasDir = td.mkpath(targetDir); if (!hasDir) { - messages.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, QString("Cannot create target directory '%1'").arg(targetDir))); + messages.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, QStringLiteral("Cannot create target directory '%1'").arg(targetDir))); return -1; } const int copied = CDirectoryUtils::copyDirectoryRecursively(CDirectoryUtils::shareTerrainProbeDirectory(), targetDir, true); - messages.push_back(CStatusMessage(cats, CStatusMessage::SeverityInfo, QString("Copied %1 files from '%2' to '%3'").arg(copied).arg(CDirectoryUtils::shareTerrainProbeDirectory(), targetDir))); + messages.push_back(CStatusMessage(cats, CStatusMessage::SeverityInfo, QStringLiteral("Copied %1 files from '%2' to '%3'").arg(copied).arg(CDirectoryUtils::shareTerrainProbeDirectory(), targetDir))); return copied; } diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.cpp b/src/blackmisc/simulation/fsx/simconnectutilities.cpp index fd210290a..0c4b2b335 100644 --- a/src/blackmisc/simulation/fsx/simconnectutilities.cpp +++ b/src/blackmisc/simulation/fsx/simconnectutilities.cpp @@ -99,18 +99,18 @@ namespace BlackMisc QString CSimConnectUtilities::simConnectCfg(const QString &ip, int port) { - const QString sc = QString("[SimConnect]\nProtocol=Ipv4\nAddress=%1\nPort=%2\n" - "MaxReceiveSize=4096\nDisableNagle=0").arg(ip).arg(port); + const QString sc = QStringLiteral("[SimConnect]\nProtocol=Ipv4\nAddress=%1\nPort=%2\n" + "MaxReceiveSize=4096\nDisableNagle=0").arg(ip).arg(port); return sc; } QString CSimConnectUtilities::resolveEnumToString(const DWORD id, const char *enumName) { const int i = CSimConnectUtilities::staticMetaObject.indexOfEnumerator(enumName); - if (i < 0) { return QString("No enumerator for %1").arg(enumName); } + if (i < 0) { return QStringLiteral("No enumerator for %1").arg(enumName); } const QMetaEnum m = CSimConnectUtilities::staticMetaObject.enumerator(i); const char *k = m.valueToKey(static_cast(id)); - return (k) ? QLatin1String(k) : QString("Id '%1' not found for %2").arg(id).arg(enumName); + return (k) ? QLatin1String(k) : QStringLiteral("Id '%1' not found for %2").arg(id).arg(enumName); } const QString &CSimConnectUtilities::simConnectIniFilename() diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolationlogger.cpp index ac2d96d38..15fb6ebd7 100644 --- a/src/blackmisc/simulation/interpolationlogger.cpp +++ b/src/blackmisc/simulation/interpolationlogger.cpp @@ -104,7 +104,7 @@ namespace BlackMisc { QString file = filePatternInterpolationLog(); file.remove('*'); - const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::logDirectory(), QString("%1 %2").arg(ts, file)); + const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::logDirectory(), QStringLiteral("%1 %2").arg(ts, file)); const bool s = CFileUtils::writeStringToFile(htmlTemplate.arg(html.arg(interpolation.size()).arg(htmlInterpolation)), fn); msgs.push_back(CInterpolationLogger::logStatusFileWriting(s, fn)); } @@ -114,7 +114,7 @@ namespace BlackMisc { QString file = filePatternPartsLog(); file.remove('*'); - const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::logDirectory(), QString("%1 %2").arg(ts, file)); + const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::logDirectory(), QStringLiteral("%1 %2").arg(ts, file)); const bool s = CFileUtils::writeStringToFile(htmlTemplate.arg(html.arg(parts.size()).arg(htmlParts)), fn); msgs.push_back(CInterpolationLogger::logStatusFileWriting(s, fn)); } @@ -393,11 +393,9 @@ namespace BlackMisc QString CInterpolationLogger::msSinceEpochToTime(qint64 t1, qint64 t2, qint64 t3) { - static const QString s2("%1 %2"); - if (t3 < 0) { return s2.arg(msSinceEpochToTime(t1), msSinceEpochToTime(t2)); } + if (t3 < 0) { return QStringLiteral("%1 %2").arg(msSinceEpochToTime(t1), msSinceEpochToTime(t2)); } - static const QString s3("%1 %2 %3"); - return s3.arg(msSinceEpochToTime(t1), msSinceEpochToTime(t2), msSinceEpochToTime(t3)); + return QStringLiteral("%1 %2 %3").arg(msSinceEpochToTime(t1), msSinceEpochToTime(t2), msSinceEpochToTime(t3)); } QString SituationLog::toQString( diff --git a/src/blackmisc/simulation/interpolationrenderingsetup.cpp b/src/blackmisc/simulation/interpolationrenderingsetup.cpp index 8fe3b2925..f2bfa19ba 100644 --- a/src/blackmisc/simulation/interpolationrenderingsetup.cpp +++ b/src/blackmisc/simulation/interpolationrenderingsetup.cpp @@ -112,7 +112,7 @@ namespace BlackMisc default: break; } BLACK_VERIFY_X(false, Q_FUNC_INFO, "Cannot handle index"); - return QString("Wrong index for %1").arg(i); + return QStringLiteral("Wrong index for %1").arg(i); } void CInterpolationAndRenderingSetupBase::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant) diff --git a/src/blackmisc/simulation/settings/modelsettings.cpp b/src/blackmisc/simulation/settings/modelsettings.cpp index 8bca5ec6c..76cf0c606 100644 --- a/src/blackmisc/simulation/settings/modelsettings.cpp +++ b/src/blackmisc/simulation/settings/modelsettings.cpp @@ -22,8 +22,7 @@ namespace BlackMisc QString CModelSettings::convertToQString(bool i18n) const { Q_UNUSED(i18n); - static const QString ms("Allow exclude: %1"); - return ms.arg(boolToYesNo(this->m_allowExcludeModels)); + return QStringLiteral("Allow exclude: %1").arg(boolToYesNo(this->m_allowExcludeModels)); } CVariant CModelSettings::propertyByIndex(const CPropertyIndex &index) const diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp index 2660557ed..97d57ad52 100644 --- a/src/blackmisc/simulation/simulatedaircraft.cpp +++ b/src/blackmisc/simulation/simulatedaircraft.cpp @@ -466,8 +466,7 @@ namespace BlackMisc if (!icaoNw.hasDesignator()) { return QStringLiteral("[x] no nw."); } if (icao.isDbEqual(icaoNw) || icao == icaoNw) { return u"[==] " % icao.getDesignatorDbKey(); } if (icao.getDesignator() == icaoNw.getDesignator()) { return u"[=] " % icao.getDesignator(); } - static const QString diff("%1 -> %2"); - return diff.arg(icaoNw.getDesignator(), icao.getDesignator()); + return QStringLiteral("%1 -> %2").arg(icaoNw.getDesignator(), icao.getDesignator()); } QString CSimulatedAircraft::getNetworkModelAirlineIcaoDifference() const diff --git a/src/blackmisc/simulation/simulatorplugininfo.cpp b/src/blackmisc/simulation/simulatorplugininfo.cpp index e6978da47..5ea2c11e8 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.cpp +++ b/src/blackmisc/simulation/simulatorplugininfo.cpp @@ -61,7 +61,7 @@ namespace BlackMisc QString CSimulatorPluginInfo::convertToQString(bool i18n) const { Q_UNUSED(i18n); - return QString("%1 (%2)").arg(m_name, m_identifier); + return QStringLiteral("%1 (%2)").arg(m_name, m_identifier); } const QString &CSimulatorPluginInfo::fsxPluginIdentifier() diff --git a/src/blackmisc/test/testing.cpp b/src/blackmisc/test/testing.cpp index a9f852244..6f62d0c3e 100644 --- a/src/blackmisc/test/testing.cpp +++ b/src/blackmisc/test/testing.cpp @@ -51,9 +51,9 @@ namespace BlackMisc // from WGS is slow, so static const (only 1 time init) // https://dev.vatsim-germany.org/issues/322#note-2 static const CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CAltitude(index, CLengthUnit::ft())); - const QString cs = QString("%1_TWR").arg(index); - const QString usr = QString("Joe %1").arg(index); - const QString id = QString("00000%1").arg(index).right(6); + const QString cs = QStringLiteral("%1_TWR").arg(index); + const QString usr = QStringLiteral("Joe %1").arg(index); + const QString id = QStringLiteral("00000%1").arg(index).right(6); const double f = 118.0 + (index % 30) * 0.25; const QDateTime dtFrom = QDateTime::currentDateTimeUtc(); @@ -114,7 +114,7 @@ namespace BlackMisc for (int i = 0; i < number; i++) { const char cc = 65 + (i % 26); - const QString icao = QString("EXX%1").arg(QLatin1Char(cc)); + const QString icao = QStringLiteral("EXX%1").arg(QLatin1Char(cc)); CAirport a(icao); a.setPosition(CCoordinateGeodetic(i, i, i)); list.push_back(a); @@ -127,14 +127,14 @@ namespace BlackMisc CClientList list; for (int i = 0; i < number; i++) { - const CCallsign cs(QString("DXX%1").arg(i)); - const QString rn = QString("Joe Doe%1").arg(i); + const CCallsign cs(QStringLiteral("DXX%1").arg(i)); + const QString rn = QStringLiteral("Joe Doe%1").arg(i); CUser user(QString::number(i), rn, cs); user.setCallsign(cs); CClient client(user); client.addCapability(CClient::FsdWithInterimPositions); client.addCapability(CClient::FsdWithIcaoCodes); - const QString myFooModel = QString("fooModel %1").arg(i); + const QString myFooModel = QStringLiteral("fooModel %1").arg(i); client.setQueriedModelString(myFooModel); list.push_back(client); } diff --git a/src/blackmisc/threadutils.cpp b/src/blackmisc/threadutils.cpp index 1e902154f..c48041524 100644 --- a/src/blackmisc/threadutils.cpp +++ b/src/blackmisc/threadutils.cpp @@ -70,8 +70,7 @@ namespace BlackMisc const QString CThreadUtils::threadToString(const void *t) { - static const QString s("0x%1"); - return s.arg(reinterpret_cast(t), 0, 16); + return QStringLiteral("0x%1").arg(reinterpret_cast(t), 0, 16); } const QString CThreadUtils::threadInfo(QThread *thread) diff --git a/src/blackmisc/timestampbased.cpp b/src/blackmisc/timestampbased.cpp index 233134e6e..9322edfda 100644 --- a/src/blackmisc/timestampbased.cpp +++ b/src/blackmisc/timestampbased.cpp @@ -201,7 +201,7 @@ namespace BlackMisc default: break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return CVariant::fromValue(m); } @@ -228,7 +228,7 @@ namespace BlackMisc default: break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); } @@ -302,8 +302,7 @@ namespace BlackMisc QString ITimestampWithOffsetBased::getTimeOffsetWithUnit() const { - static const QString os("%1ms"); - return os.arg(this->getTimeOffsetMs()); + return QStringLiteral("%1ms").arg(this->getTimeOffsetMs()); } CVariant ITimestampWithOffsetBased::propertyByIndex(const CPropertyIndex &index) const @@ -320,7 +319,7 @@ namespace BlackMisc default: break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return CVariant(); } @@ -339,7 +338,7 @@ namespace BlackMisc default: break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); } @@ -357,7 +356,7 @@ namespace BlackMisc default: break; } } - const QString m = QString("Cannot handle index %1").arg(index.toQString()); + const QString m = QStringLiteral("Cannot handle index %1").arg(index.toQString()); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return 0; } diff --git a/src/blackmisc/timestampobjectlist.h b/src/blackmisc/timestampobjectlist.h index 1ab845b80..39ca3f55a 100644 --- a/src/blackmisc/timestampobjectlist.h +++ b/src/blackmisc/timestampobjectlist.h @@ -35,7 +35,7 @@ namespace BlackMisc void reset() { min = -1; max = -1; mean = -1;} //! As string - QString asString() const { static const QString s("Min: %1ms Max: %2ms Mean: %3ms"); return s.arg(min).arg(max).arg(mean, 0, 'f', 2); } + QString asString() const { return QStringLiteral("Min: %1ms Max: %2ms Mean: %3ms").arg(min).arg(max).arg(mean, 0, 'f', 2); } }; //! List of objects with timestamp. diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp index 2444b6f21..d029f8628 100644 --- a/src/blackmisc/valuecache.cpp +++ b/src/blackmisc/valuecache.cpp @@ -548,7 +548,7 @@ namespace BlackMisc { QMutexLocker lock(&m_mutex); QString hr = m_humanReadable.value(key); - return hr.isEmpty() ? key : QString("%1 (%2)").arg(hr, key); + return hr.isEmpty() ? key : QStringLiteral("%1 (%2)").arg(hr, key); } void CValueCache::setHumanReadableName(const QString &key, const QString &name) @@ -613,7 +613,7 @@ namespace BlackMisc {} const QString m_key; const QString m_name; - const QString m_nameWithKey = m_name.isEmpty() ? m_key : QString("%1 (%2)").arg(m_name, m_key); + const QString m_nameWithKey = m_name.isEmpty() ? m_key : QStringLiteral("%1 (%2)").arg(m_name, m_key); LockFree m_value; std::atomic m_timestamp { 0 }; const int m_metaType = QMetaType::UnknownType; @@ -838,7 +838,7 @@ namespace BlackMisc { if (! value.isValid()) { - return CStatusMessage(this, invalidSeverity, QString("Empty cache value %1").arg(element.m_nameWithKey), true); + return CStatusMessage(this, invalidSeverity, QStringLiteral("Empty cache value %1").arg(element.m_nameWithKey), true); } else if (value.userType() != element.m_metaType) { diff --git a/src/blackmisc/weather/cloudlayer.cpp b/src/blackmisc/weather/cloudlayer.cpp index 1ac5a7c26..4d3a34168 100644 --- a/src/blackmisc/weather/cloudlayer.cpp +++ b/src/blackmisc/weather/cloudlayer.cpp @@ -118,7 +118,7 @@ namespace BlackMisc { Overcast, "overcast" } }; - return QString("%1 from %2 to %3").arg(hash.value(getCoverage()), m_base.toQString(), m_top.toQString()); + return QStringLiteral("%1 from %2 to %3").arg(hash.value(getCoverage()), m_base.toQString(), m_top.toQString()); } } // namespace diff --git a/src/blackmisc/weather/metar.cpp b/src/blackmisc/weather/metar.cpp index 380e70f57..d45321320 100644 --- a/src/blackmisc/weather/metar.cpp +++ b/src/blackmisc/weather/metar.cpp @@ -130,20 +130,20 @@ namespace BlackMisc } const QString metarDescription = - QString("Station: %1 \n").arg(m_airport.getIcaoCode()) - % QString("Date/Time: %1 %2 UTC\n").arg(m_reportDay).arg(m_reportTime.formattedHrsMin()) + QStringLiteral("Station: %1 \n").arg(m_airport.getIcaoCode()) + % QStringLiteral("Date/Time: %1 %2 UTC\n").arg(m_reportDay).arg(m_reportTime.formattedHrsMin()) % m_windLayer.toQString() % u'\n' - % QString("Visibility: %1\n").arg(m_visibility.toQString()) + % QStringLiteral("Visibility: %1\n").arg(m_visibility.toQString()) % u"Weather: " % presentWeathers.simplified() % u'\n' % u"Clouds:" % clouds % u'\n' - % QString("Temperature: %1\n").arg(m_temperature.toQString()) - % QString("Dewpoint: %1\n").arg(m_dewPoint.toQString()) - % QString("Altimeter: %1\n").arg(m_altimeter.toQString()); + % QStringLiteral("Temperature: %1\n").arg(m_temperature.toQString()) + % QStringLiteral("Dewpoint: %1\n").arg(m_dewPoint.toQString()) + % QStringLiteral("Altimeter: %1\n").arg(m_altimeter.toQString()); return metarDescription; } diff --git a/src/blackmisc/weather/temperaturelayer.cpp b/src/blackmisc/weather/temperaturelayer.cpp index 710459dfe..3ea0540c2 100644 --- a/src/blackmisc/weather/temperaturelayer.cpp +++ b/src/blackmisc/weather/temperaturelayer.cpp @@ -71,7 +71,7 @@ namespace BlackMisc QString CTemperatureLayer::convertToQString(bool /** i18n **/) const { - return QString("%1 %2 at %3").arg(m_temperature.toQString(), QString::number(m_relativeHumidity), m_level.toQString()); + return QStringLiteral("%1 %2 at %3").arg(m_temperature.toQString(), QString::number(m_relativeHumidity), m_level.toQString()); } } // namespace diff --git a/src/blackmisc/weather/visibilitylayer.cpp b/src/blackmisc/weather/visibilitylayer.cpp index 73cb90bfe..d4a8d03a2 100644 --- a/src/blackmisc/weather/visibilitylayer.cpp +++ b/src/blackmisc/weather/visibilitylayer.cpp @@ -65,7 +65,7 @@ namespace BlackMisc QString CVisibilityLayer::convertToQString(bool /** i18n **/) const { - QString visibilityAsString = QString("Visibility: %1 from %2 to %3"); + QString visibilityAsString = QStringLiteral("Visibility: %1 from %2 to %3"); visibilityAsString = visibilityAsString.arg(m_visibility.toQString(), m_base.toQString(), m_top.toQString()); return visibilityAsString; } diff --git a/src/blackmisc/weather/weatherdataplugininfo.cpp b/src/blackmisc/weather/weatherdataplugininfo.cpp index da4c8827c..e05d138d2 100644 --- a/src/blackmisc/weather/weatherdataplugininfo.cpp +++ b/src/blackmisc/weather/weatherdataplugininfo.cpp @@ -43,7 +43,7 @@ namespace BlackMisc QString CWeatherDataPluginInfo::convertToQString(bool i18n) const { Q_UNUSED(i18n); - return QString("%1 (%2)").arg(m_name, m_identifier); + return QStringLiteral("%1 (%2)").arg(m_name, m_identifier); } } // ns diff --git a/src/blackmisc/weather/windlayer.cpp b/src/blackmisc/weather/windlayer.cpp index 76bfc96f6..50574a75a 100644 --- a/src/blackmisc/weather/windlayer.cpp +++ b/src/blackmisc/weather/windlayer.cpp @@ -76,15 +76,15 @@ namespace BlackMisc { QString windAsString = QString("Wind: "); if (m_directionVariable) windAsString += "variable "; - else windAsString += QString("%1 ").arg(m_directionMain.toQString()); + else windAsString += QStringLiteral("%1 ").arg(m_directionMain.toQString()); if (m_directionFrom != CAngle() && m_directionTo != CAngle()) { - windAsString += QString("variable between %1 and %2 ").arg(m_directionFrom.toQString(), m_directionTo.toQString()); + windAsString += QStringLiteral("variable between %1 and %2 ").arg(m_directionFrom.toQString(), m_directionTo.toQString()); } - windAsString += QString("at %2").arg(m_speed.toQString()); - if (m_gustSpeed.value() > 0.5) windAsString += QString(" and gusts at %1").arg(m_gustSpeed.toQString()); + windAsString += QStringLiteral("at %2").arg(m_speed.toQString()); + if (m_gustSpeed.value() > 0.5) windAsString += QStringLiteral(" and gusts at %1").arg(m_gustSpeed.toQString()); return windAsString; } diff --git a/src/blackmisc/windllutils.cpp b/src/blackmisc/windllutils.cpp index 973ca9511..6cf75b8cb 100644 --- a/src/blackmisc/windllutils.cpp +++ b/src/blackmisc/windllutils.cpp @@ -43,7 +43,7 @@ namespace BlackMisc { constexpr int fieldWidth = 4; constexpr int base = 16; - QString subBlockNameBuffer = QString("\\StringFileInfo\\%1%2\\%3") + QString subBlockNameBuffer = QStringLiteral("\\StringFileInfo\\%1%2\\%3") .arg(codePage.wLanguage, fieldWidth, base, QLatin1Char('0')) .arg(codePage.wCodePage, fieldWidth, base, QLatin1Char('0')) .arg(stringName); @@ -62,7 +62,7 @@ namespace BlackMisc const QFile dllQFile(dllFile); if (!dllQFile.exists()) { - result.errorMsg = QString("No file '%1'").arg(dllFile); + result.errorMsg = QStringLiteral("No file '%1'").arg(dllFile); return result; } const QString dll(QDir::toNativeSeparators(dllFile)); @@ -79,27 +79,27 @@ namespace BlackMisc dwSize = GetFileVersionInfoSize(pszFilePath, nullptr); if (dwSize == 0) { - result.errorMsg = QString("Error in GetFileVersionInfoSize: %1\n").arg(GetLastError()); + result.errorMsg = QStringLiteral("Error in GetFileVersionInfoSize: %1\n").arg(GetLastError()); return result; } std::vector pbVersionInfo(dwSize); if (!GetFileVersionInfo(pszFilePath, 0, dwSize, pbVersionInfo.data())) { - result.errorMsg = QString("Error in GetFileVersionInfo: %1\n").arg(GetLastError()); + result.errorMsg = QStringLiteral("Error in GetFileVersionInfo: %1\n").arg(GetLastError()); return result; } // Language independent version of VerQueryValue if (!VerQueryValue(pbVersionInfo.data(), TEXT("\\"), reinterpret_cast(&pFileInfo), &puLenFileInfo)) { - result.errorMsg = QString("Error in VerQueryValue: %1\n").arg(GetLastError()); + result.errorMsg = QStringLiteral("Error in VerQueryValue: %1\n").arg(GetLastError()); return result; } // pFileInfo->dwFileVersionMS is usually zero. // However, you should check this if your version numbers seem to be wrong - result.fileVersion = QString("%1.%2.%3.%4") + result.fileVersion = QStringLiteral("%1.%2.%3.%4") .arg((pFileInfo->dwFileVersionMS >> 16) & 0xffff) .arg((pFileInfo->dwFileVersionMS >> 0) & 0xffff) .arg((pFileInfo->dwFileVersionLS >> 16) & 0xffff) @@ -107,7 +107,7 @@ namespace BlackMisc // pFileInfo->dwProductVersionMS is usually zero. However, you should check // this if your version numbers seem to be wrong - result.productVersion = QString("%1.%2.%3.%4") + result.productVersion = QStringLiteral("%1.%2.%3.%4") .arg((pFileInfo->dwProductVersionMS >> 16) & 0xffff) .arg((pFileInfo->dwProductVersionMS >> 0) & 0xffff) .arg((pFileInfo->dwProductVersionLS >> 16) & 0xffff) diff --git a/src/plugins/simulator/fscommon/fsuipcimpl.cpp b/src/plugins/simulator/fscommon/fsuipcimpl.cpp index 75ec314fe..fda78b6ce 100644 --- a/src/plugins/simulator/fscommon/fsuipcimpl.cpp +++ b/src/plugins/simulator/fscommon/fsuipcimpl.cpp @@ -89,12 +89,13 @@ namespace BlackSimPlugin { const int simIndex = static_cast(FSUIPC_FS_Version); const QString sim = CFsuipc::simulator(simIndex); - QString ver = QStringLiteral("%1.%2.%3.%4%5").arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 28)))) + QString ver = QStringLiteral("%1.%2.%3.%4%5") + .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 28)))) .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 24)))) .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 20)))) .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 16)))) .arg((FSUIPC_Version & 0xffff) ? QString(QLatin1Char('a' + static_cast(FSUIPC_Version & 0xff) - 1)) : ""); - m_fsuipcVersion = QString("FSUIPC %1 (%2)").arg(ver, sim); + m_fsuipcVersion = QStringLiteral("FSUIPC %1 (%2)").arg(ver, sim); CLogMessage(this).info("FSUIPC connected: %1") << m_fsuipcVersion; } else diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index 7890baa9d..0b43b5c7d 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -1425,8 +1425,8 @@ namespace BlackSimPlugin Q_ASSERT_X(!hasPendingAdded || m_simConnectObjects.countPendingAdded() < 2, Q_FUNC_INFO, "There must be only 0..1 pending objects"); if (this->showDebugLogMessage()) { - this->debugLogMessage(Q_FUNC_INFO, QString("CS: '%1' mode: '%2' model: '%3'").arg(newRemoteAircraft.getCallsignAsString(), modeToString(addMode), newRemoteAircraft.getModelString())); - this->debugLogMessage(Q_FUNC_INFO, QString("CS: '%1' pending callsigns: '%2', pending objects: '%3'").arg(newRemoteAircraft.getCallsignAsString(), m_addPendingAircraft.getAllCallsignStrings(true).join(", "), m_simConnectObjects.getPendingAddedCallsigns().getCallsignStrings().join(", "))); + this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("CS: '%1' mode: '%2' model: '%3'").arg(newRemoteAircraft.getCallsignAsString(), modeToString(addMode), newRemoteAircraft.getModelString())); + this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("CS: '%1' pending callsigns: '%2', pending objects: '%3'").arg(newRemoteAircraft.getCallsignAsString(), m_addPendingAircraft.getAllCallsignStrings(true).join(", "), m_simConnectObjects.getPendingAddedCallsigns().getCallsignStrings().join(", "))); } // do we need to remove/add again because something has changed? @@ -1452,7 +1452,7 @@ namespace BlackSimPlugin this->physicallyRemoveRemoteAircraft(newRemoteAircraft.getCallsign()); m_addAgainAircraftWhenRemoved.replaceOrAddByCallsign(newRemoteAircraft); - if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("CS: '%1' re-added changed model '%2', will be added again").arg(newRemoteAircraft.getCallsignAsString(), newModelString)); } + if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("CS: '%1' re-added changed model '%2', will be added again").arg(newRemoteAircraft.getCallsignAsString(), newModelString)); } return false; } @@ -1530,7 +1530,7 @@ namespace BlackSimPlugin const SIMCONNECT_DATA_INITPOSITION initialPosition = CSimulatorFsxCommon::aircraftSituationToFsxPosition(initialSituation, sendGround, true, &underflowStatus); const QString modelString(newRemoteAircraft.getModelString()); - if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("CS: '%1' model: '%2' request: %3, init pos: %4").arg(callsign.toQString(), modelString).arg(requestId).arg(fsxPositionToString(initialPosition))); } + if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("CS: '%1' model: '%2' request: %3, init pos: %4").arg(callsign.toQString(), modelString).arg(requestId).arg(fsxPositionToString(initialPosition))); } const QByteArray modelStringBa = toFsxChar(modelString); const QByteArray csBa = toFsxChar(callsign.toQString().left(12)); @@ -1553,9 +1553,8 @@ namespace BlackSimPlugin { // we will request a new aircraft by request ID, later we will receive its object id // so far this object id is 0 (DWORD) - static const QString mode("mode: %1"); const CSimConnectObject simObject = this->insertNewSimConnectObject(newRemoteAircraft, requestId, removedPendingObj); - this->traceSendId(simObject, Q_FUNC_INFO, mode.arg(CSimulatorFsxCommon::modeToString(addMode)), true); + this->traceSendId(simObject, Q_FUNC_INFO, QStringLiteral("mode: %1").arg(CSimulatorFsxCommon::modeToString(addMode)), true); adding = true; } return adding; @@ -1648,7 +1647,7 @@ namespace BlackSimPlugin // mark as removed simObject.setPendingRemoved(true); - if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("CS: '%1' request/object id: %2/%3").arg(callsign.toQString()).arg(simObject.getRequestId()).arg(simObject.getObjectId())); } + if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("CS: '%1' request/object id: %2/%3").arg(callsign.toQString()).arg(simObject.getRequestId()).arg(simObject.getObjectId())); } // call in SIM const SIMCONNECT_DATA_REQUEST_ID requestId = simObject.getRequestId(CSimConnectDefinitions::SimObjectRemove); @@ -2022,7 +2021,7 @@ namespace BlackSimPlugin } // missing lights info from simulator so far - if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("Missing light state in simulator for '%1', model '%2'").arg(callsign.asString(), simObj.getAircraftModelString())); } + if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("Missing light state in simulator for '%1', model '%2'").arg(callsign.asString(), simObj.getAircraftModelString())); } const QPointer myself(this); QTimer::singleShot(DeferResendingLights, this, [ = ] @@ -2032,7 +2031,7 @@ namespace BlackSimPlugin const CSimConnectObject currentSimObject = m_simConnectObjects[callsign]; if (!currentSimObject.isReadyToSend()) { return; } // stale if (lightsWanted != currentSimObject.getLightsAsSent()) { return; } // changed in between, so another call sendToggledLightsToSimulator is pending - if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("Resending light state for '%1', model '%2'").arg(callsign.asString(), simObj.getAircraftModelString())); } + if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("Resending light state for '%1', model '%2'").arg(callsign.asString(), simObj.getAircraftModelString())); } this->sendToggledLightsToSimulator(currentSimObject, lightsWanted, true); }); } @@ -2567,7 +2566,7 @@ namespace BlackSimPlugin this->physicallyRemoveRemoteAircraft(callsign); } - if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("CS: '%1'").arg(callsignsToBeRemoved.toStringList().join(", "))); } + if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("CS: '%1'").arg(callsignsToBeRemoved.toStringList().join(", "))); } return callsignsToBeRemoved; } @@ -2686,10 +2685,10 @@ namespace BlackSimPlugin case SIMCONNECT_RECV_ID_OPEN: { SIMCONNECT_RECV_OPEN *event = static_cast(pData); - simListener->m_simulatorVersion = QString("%1.%2.%3.%4").arg(event->dwApplicationVersionMajor).arg(event->dwApplicationVersionMinor).arg(event->dwApplicationBuildMajor).arg(event->dwApplicationBuildMinor); - simListener->m_simConnectVersion = QString("%1.%2.%3.%4").arg(event->dwSimConnectVersionMajor).arg(event->dwSimConnectVersionMinor).arg(event->dwSimConnectBuildMajor).arg(event->dwSimConnectBuildMinor); + simListener->m_simulatorVersion = QStringLiteral("%1.%2.%3.%4").arg(event->dwApplicationVersionMajor).arg(event->dwApplicationVersionMinor).arg(event->dwApplicationBuildMajor).arg(event->dwApplicationBuildMinor); + simListener->m_simConnectVersion = QStringLiteral("%1.%2.%3.%4").arg(event->dwSimConnectVersionMajor).arg(event->dwSimConnectVersionMinor).arg(event->dwSimConnectBuildMajor).arg(event->dwSimConnectBuildMinor); simListener->m_simulatorName = CSimulatorFsxCommon::fsxCharToQString(event->szApplicationName); - simListener->m_simulatorDetails = QString("Name: '%1' Version: %2 SimConnect: %3").arg(simListener->m_simulatorName, simListener->m_simulatorVersion, simListener->m_simConnectVersion); + simListener->m_simulatorDetails = QStringLiteral("Name: '%1' Version: %2 SimConnect: %3").arg(simListener->m_simulatorName, simListener->m_simulatorVersion, simListener->m_simConnectVersion); const CStatusMessage msg = CStatusMessage(simListener).info("Connect to %1: '%2'") << simListener->getPluginInfo().getIdentifier() << simListener->backendInfo(); // avoid the same message over and over again diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 667f0a6bb..c8aa69a1b 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -136,8 +136,7 @@ namespace BlackSimPlugin QString CSimulatorXPlane::getStatisticsSimulatorSpecific() const { - static const QString s("Add-time: %1ms/%2ms"); - return s.arg(m_statsAddCurrentTimeMs).arg(m_statsAddMaxTimeMs); + return QStringLiteral("Add-time: %1ms/%2ms").arg(m_statsAddCurrentTimeMs).arg(m_statsAddMaxTimeMs); } void CSimulatorXPlane::resetAircraftStatistics() @@ -349,7 +348,7 @@ namespace BlackSimPlugin emitOwnAircraftModelChanged(m_serviceProxy->getAircraftModelPath(), m_serviceProxy->getAircraftModelFilename(), m_serviceProxy->getAircraftLivery(), m_serviceProxy->getAircraftIcaoCode(), m_serviceProxy->getAircraftModelString(), m_serviceProxy->getAircraftName(), m_serviceProxy->getAircraftDescription()); - QString xplaneVersion = QString("%1.%2").arg(m_serviceProxy->getXPlaneVersionMajor()).arg(m_serviceProxy->getXPlaneVersionMinor()); + QString xplaneVersion = QStringLiteral("%1.%2").arg(m_serviceProxy->getXPlaneVersionMajor()).arg(m_serviceProxy->getXPlaneVersionMinor()); setSimulatorDetails("X-Plane", {}, xplaneVersion); connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged); connect(m_serviceProxy, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::setAirportsInRange); diff --git a/tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.cpp b/tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.cpp index aec4e65f3..25e1b8caf 100644 --- a/tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.cpp +++ b/tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.cpp @@ -133,8 +133,8 @@ namespace BlackMiscTest { CSpeed s1(100, CSpeedUnit::km_h()); CSpeed s2(1000, CSpeedUnit::ft_min()); - QVERIFY2(CMathUtils::epsilonEqual(s1.valueRounded(CSpeedUnit::NM_h(), 0), 54), qPrintable(QString("100km/h is not %1 NM/h").arg(s1.valueRounded(CSpeedUnit::NM_h(), 0)))); - QVERIFY2(CMathUtils::epsilonEqual(s2.valueRounded(CSpeedUnit::m_s(), 1), 5.1), qPrintable(QString("1000ft/min is not %1 m/s").arg(s2.valueRounded(CSpeedUnit::m_s(), 1)))); + QVERIFY2(CMathUtils::epsilonEqual(s1.valueRounded(CSpeedUnit::NM_h(), 0), 54), qPrintable(QStringLiteral("100km/h is not %1 NM/h").arg(s1.valueRounded(CSpeedUnit::NM_h(), 0)))); + QVERIFY2(CMathUtils::epsilonEqual(s2.valueRounded(CSpeedUnit::m_s(), 1), 5.1), qPrintable(QStringLiteral("1000ft/min is not %1 m/s").arg(s2.valueRounded(CSpeedUnit::m_s(), 1)))); } void CTestPhysicalQuantities::frequencyTests() @@ -155,7 +155,7 @@ namespace BlackMiscTest CAngle a4(35.436, CAngleUnit::sexagesimalDegMin()); // 35.72666 CAngle a5(-60.3015, CAngleUnit::sexagesimalDeg()); // negative angles = west longitude or south latitude a2.switchUnit(CAngleUnit::deg()); - QVERIFY2(CMathUtils::epsilonEqual(a1.piFactor(), 1.00), qPrintable(QString("Pi should be 1PI, not %1").arg(a1.piFactor()))); + QVERIFY2(CMathUtils::epsilonEqual(a1.piFactor(), 1.00), qPrintable(QStringLiteral("Pi should be 1PI, not %1").arg(a1.piFactor()))); QVERIFY2(CMathUtils::epsilonEqual(a3.valueRounded(CAngleUnit::deg()), 35.73), "Expecting 35.73"); QVERIFY2(CMathUtils::epsilonEqual(a4.valueRounded(CAngleUnit::deg()), 35.73), "Expecting 35.73"); QVERIFY2(CMathUtils::epsilonEqual(a5.valueRounded(CAngleUnit::deg(), 4), -60.5042), "Expecting -60.5042"); @@ -208,10 +208,10 @@ namespace BlackMiscTest CTemperature t2(1, CTemperatureUnit::F()); // 1F CTemperature t3(220.15, CTemperatureUnit::F()); CTemperature t4(10, CTemperatureUnit::F()); - QVERIFY2(CMathUtils::epsilonEqual(t1.valueRounded(CTemperatureUnit::K()), 273.15), qPrintable(QString("0C shall be 273.15K, not %1 K").arg(t1.valueRounded(CTemperatureUnit::K())))); - QVERIFY2(CMathUtils::epsilonEqual(t2.valueRounded(CTemperatureUnit::C()), -17.22), qPrintable(QString("1F shall be -17.22C, not %1 C").arg(t2.valueRounded(CTemperatureUnit::C())))); - QVERIFY2(CMathUtils::epsilonEqual(t3.valueRounded(CTemperatureUnit::C()), 104.53), qPrintable(QString("220.15F shall be 104.53C, not %1 C").arg(t3.valueRounded(CTemperatureUnit::C())))); - QVERIFY2(CMathUtils::epsilonEqual(t4.valueRounded(CTemperatureUnit::K()), 260.93), qPrintable(QString("10F shall be 260.93K, not %1 K").arg(t4.valueRounded(CTemperatureUnit::K())))); + QVERIFY2(CMathUtils::epsilonEqual(t1.valueRounded(CTemperatureUnit::K()), 273.15), qPrintable(QStringLiteral("0C shall be 273.15K, not %1 K").arg(t1.valueRounded(CTemperatureUnit::K())))); + QVERIFY2(CMathUtils::epsilonEqual(t2.valueRounded(CTemperatureUnit::C()), -17.22), qPrintable(QStringLiteral("1F shall be -17.22C, not %1 C").arg(t2.valueRounded(CTemperatureUnit::C())))); + QVERIFY2(CMathUtils::epsilonEqual(t3.valueRounded(CTemperatureUnit::C()), 104.53), qPrintable(QStringLiteral("220.15F shall be 104.53C, not %1 C").arg(t3.valueRounded(CTemperatureUnit::C())))); + QVERIFY2(CMathUtils::epsilonEqual(t4.valueRounded(CTemperatureUnit::K()), 260.93), qPrintable(QStringLiteral("10F shall be 260.93K, not %1 K").arg(t4.valueRounded(CTemperatureUnit::K())))); } void CTestPhysicalQuantities::timeTests() diff --git a/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp b/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp index 045870d63..ddfccc834 100644 --- a/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp +++ b/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp @@ -119,7 +119,7 @@ namespace BlackMiscTest QVERIFY2(result.getInterpolationStatus().isInterpolated(), "Value was not interpolated"); const double latDeg = currentSituation.getPosition().latitude().valueRounded(CAngleUnit::deg(), 5); const double lngDeg = currentSituation.getPosition().longitude().valueRounded(CAngleUnit::deg(), 5); - QVERIFY2(latDeg < latOld && lngDeg < lngOld, QString("Values shall decrease: %1/%2 %3/%4").arg(latDeg).arg(latOld).arg(lngDeg).arg(lngOld).toLatin1()); + QVERIFY2(latDeg < latOld && lngDeg < lngOld, QStringLiteral("Values shall decrease: %1/%2 %3/%4").arg(latDeg).arg(latOld).arg(lngDeg).arg(lngOld).toLatin1()); QVERIFY2(latDeg >= 0 && latDeg <= IRemoteAircraftProvider::MaxSituationsPerCallsign, "Values shall be in range"); latOld = latDeg; lngOld = lngDeg;