diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp index c7bcb1602..3e9aa4f50 100644 --- a/src/blackconfig/buildconfig.cpp +++ b/src/blackconfig/buildconfig.cpp @@ -168,7 +168,7 @@ namespace BlackConfig const QString &CBuildConfig::getVersionStringPlatform() { - static const QString s = getPlatformString() % QStringLiteral(" ") % getVersionString(); + static const QString s = getPlatformString() % u' ' % getVersionString(); return s; } diff --git a/src/blackcore/context/context.h b/src/blackcore/context/context.h index 228b7a09a..e6dba1be0 100644 --- a/src/blackcore/context/context.h +++ b/src/blackcore/context/context.h @@ -153,7 +153,7 @@ namespace BlackCore //! Path and context id QString buildPathAndContextId(const QString &path) const { - return path % QStringLiteral(":") % QString::number(this->getUniqueId()); + return path % u':' % QString::number(this->getUniqueId()); } //! Relay signals from this class diff --git a/src/blackcore/db/databasereaderconfig.cpp b/src/blackcore/db/databasereaderconfig.cpp index 49200f108..692c59ce8 100644 --- a/src/blackcore/db/databasereaderconfig.cpp +++ b/src/blackcore/db/databasereaderconfig.cpp @@ -32,9 +32,9 @@ namespace BlackCore { return CDbFlags::flagToString(this->getRetrievalMode()) % - QStringLiteral(" ") % + u' ' % CEntityFlags::flagToString(this->getEntities()) % - QStringLiteral(" ") % + u' ' % this->m_cacheLifetime.toQString(i18n); } diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 39d1f7300..13f04ece2 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -1044,11 +1044,11 @@ namespace BlackCore QString dm; if (s.tsCurrent > 0) { - dm = QStringLiteral("Setup: ") % s.usedSetup.toQString(true) % - QStringLiteral("\n\n") % - QStringLiteral("Situation: ") % s.toQString(false, true, true, true, true, sep); + dm = u"Setup: " % s.usedSetup.toQString(true) % + u"\n\n" % + u"Situation: " % s.toQString(false, true, true, true, true, sep); } - if (p.tsCurrent > 0) { dm += (dm.isEmpty() ? QString() : QStringLiteral("\n\n")) % QStringLiteral("Parts: ") % p.toQString(sep); } + if (p.tsCurrent > 0) { dm += (dm.isEmpty() ? u"Parts: " : u"\n\nParts: ") % p.toQString(sep); } return dm; } diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index ddb78ffbe..2ff79be57 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -1425,22 +1425,22 @@ namespace BlackCore { if (ca >= 1000) { - cruiseAltString = QStringLiteral("FL") % QString::number(ca / 100); + cruiseAltString = u"FL" % QString::number(ca / 100); } else { - cruiseAltString = QStringLiteral("FL") % cruiseAltString; + cruiseAltString = u"FL" % cruiseAltString; } } else // VFR { if (ca >= 5000) { - cruiseAltString = QStringLiteral("FL") % QString::number(ca / 100); + cruiseAltString = u"FL" % QString::number(ca / 100); } else { - cruiseAltString = cruiseAltString % QStringLiteral("ft"); + cruiseAltString = cruiseAltString % u"ft"; } } } diff --git a/src/blackgui/components/altitudedialog.cpp b/src/blackgui/components/altitudedialog.cpp index 9e2f70349..df4708c98 100644 --- a/src/blackgui/components/altitudedialog.cpp +++ b/src/blackgui/components/altitudedialog.cpp @@ -109,25 +109,25 @@ namespace BlackGui m_altitudeStr = QStringLiteral("VFR"); break; case FlightFlevelInFeet: - m_altitudeStr = QStringLiteral("FL") % ui->le_FLft->text(); + m_altitudeStr = u"FL" % ui->le_FLft->text(); break; case MetricLevelInTensOfMeters: - m_altitudeStr = QStringLiteral("S") % ui->le_Sm->text(); + m_altitudeStr = u'S' % ui->le_Sm->text(); break; case AltitudeInHundredsOfFeet: - m_altitudeStr = QStringLiteral("A") % ui->le_AltitudeAFt->text(); + m_altitudeStr = u'A' % ui->le_AltitudeAFt->text(); break; case AltitudeInTensOfMeters: - m_altitudeStr = QStringLiteral("M") % ui->le_AltitudeMm->text(); + m_altitudeStr = u'M' % ui->le_AltitudeMm->text(); break; case AltitudeInFeet: - m_altitudeStr = ui->le_AltitudeFt->text() % QStringLiteral("ft"); + m_altitudeStr = ui->le_AltitudeFt->text() % u"ft"; break; case AltitudeInMeters: - m_altitudeStr = ui->le_AltitudeM->text() % QStringLiteral("m"); + m_altitudeStr = ui->le_AltitudeM->text() % u"m"; break; case AltitudeInMetersConvertedToFeet: - m_altitudeStr = ui->le_AltitudeConvertedFt->text() % QStringLiteral("m"); + m_altitudeStr = ui->le_AltitudeConvertedFt->text() % u"m"; break; case StringOnly: return; diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index 5cda5d4a6..2c120891d 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -246,7 +246,7 @@ namespace BlackGui const CMetar metar(sGui->getIContextNetwork()->getMetarForAirport(icao)); if (metar.hasMessage()) { - const QString metarText = metar.getMessage() % QStringLiteral("\n\n") % metar.getMetarText(); + const QString metarText = metar.getMessage() % u"\n\n" % metar.getMetarText(); ui->te_AtcStationsOnlineInfo->setText(metarText); } else diff --git a/src/blackgui/components/copysettingsandcachescomponent.cpp b/src/blackgui/components/copysettingsandcachescomponent.cpp index a1d6844b4..18c5d1af5 100644 --- a/src/blackgui/components/copysettingsandcachescomponent.cpp +++ b/src/blackgui/components/copysettingsandcachescomponent.cpp @@ -445,7 +445,7 @@ namespace BlackGui } else { - ui->le_Status->setText(msg.getMessage() % QStringLiteral(" ") % value); + ui->le_Status->setText(msg.getMessage() % u' ' % value); } if (sGui) { sGui->processEventsToRefreshGui(); } } diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 34ef1331c..3a4b7ecb8 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -858,8 +858,8 @@ namespace BlackGui QString name("Flight plan"); if (!ui->le_DestinationAirport->text().isEmpty() && !ui->le_OriginAirport->text().isEmpty()) { - name += QStringLiteral(" ") % ui->le_OriginAirport->text() % - QStringLiteral("-") % ui->le_DestinationAirport->text(); + name += u' ' % ui->le_OriginAirport->text() % + u'-' % ui->le_DestinationAirport->text(); } if (!name.endsWith(CFileUtils::jsonAppendix(), Qt::CaseInsensitive)) diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index fdd09a62d..918ca2b8d 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -586,8 +586,8 @@ namespace BlackGui { const QString ac( ownAircraft.getAircraftIcaoCodeDesignator() % - (ownAircraft.hasAirlineDesignator() ? (QLatin1Char(' ') % ownAircraft.getAirlineIcaoCodeDesignator()) : QString()) % - (ownAircraft.hasModelString() ? (QLatin1Char(' ') % ownAircraft.getModelString()) : QString()) + (ownAircraft.hasAirlineDesignator() ? (u' ' % ownAircraft.getAirlineIcaoCodeDesignator()) : QString()) % + (ownAircraft.hasModelString() ? (u' ' % ownAircraft.getModelString()) : QString()) ); ui->le_LoginSince->setText(QDateTime::currentDateTimeUtc().toString()); ui->le_LoginAsAircaft->setText(ac); diff --git a/src/blackgui/components/navigatordialog.cpp b/src/blackgui/components/navigatordialog.cpp index 81fb286ab..969fb7930 100644 --- a/src/blackgui/components/navigatordialog.cpp +++ b/src/blackgui/components/navigatordialog.cpp @@ -101,7 +101,7 @@ namespace BlackGui if (!action) { continue; } QToolButton *tb = new QToolButton(ui->fr_NavigatorDialogInner); tb->setDefaultAction(action); - tb->setObjectName(this->objectName() % QStringLiteral(":") % action->objectName()); + tb->setObjectName(this->objectName() % u':' % action->objectName()); if (!action->text().isEmpty()) { tb->setToolTip(action->text()); diff --git a/src/blackgui/components/remoteaircraftselector.cpp b/src/blackgui/components/remoteaircraftselector.cpp index 7c91e3732..1b087b3fb 100644 --- a/src/blackgui/components/remoteaircraftselector.cpp +++ b/src/blackgui/components/remoteaircraftselector.cpp @@ -108,13 +108,13 @@ namespace BlackGui QString i(aircraft.getCallsign().toQString()); if (aircraft.hasAircraftDesignator()) { - i += QStringLiteral(" (") % + i += u" (" % aircraft.getAircraftIcaoCode().toQString(false) % - QStringLiteral(")"); + u')'; } if (aircraft.hasRealName()) { - i += QStringLiteral(" - ") % aircraft.getPilotRealName(); + i += u" - " % aircraft.getPilotRealName(); } if (m_showPartsEnabled) { diff --git a/src/blackgui/components/settingstextmessagestyle.cpp b/src/blackgui/components/settingstextmessagestyle.cpp index 56e4ccf0b..a6fdbe7b3 100644 --- a/src/blackgui/components/settingstextmessagestyle.cpp +++ b/src/blackgui/components/settingstextmessagestyle.cpp @@ -95,7 +95,7 @@ namespace BlackGui if (familySizeStlye.size() != 3) { return false; } static const QString f("font-family: \"%1\"; font-size: %2; font-style: %3"); - const QString tableStyle = QStringLiteral("table { ") % f.arg(familySizeStlye.at(0), familySizeStlye.at(1), familySizeStlye.at(2)) % QStringLiteral(" }"); + const QString tableStyle = u"table { " % f.arg(familySizeStlye.at(0), familySizeStlye.at(1), familySizeStlye.at(2)) % u" }"; this->replaceTableStyle(tableStyle); return true; } @@ -146,7 +146,7 @@ namespace BlackGui if (ptSize < 6) { return false; } } - const QString pt = QString::number(ptSize) % "pt"; + const QString pt = QString::number(ptSize) % u"pt"; QString tableStyle = matches.front(); thread_local const QRegularExpression rePt("\\d{1,2}pt"); tableStyle.replace(rePt, pt); diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index 982e5b457..0adcbc141 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -352,11 +352,11 @@ namespace BlackGui QString f2 = QStringLiteral("COM2: %1").arg(f2n); if (f1Stations.size() == 1) { - f1 += QStringLiteral(" ") % f1Stations.front().getCallsignAndControllerRealName(); + f1 += u' ' % f1Stations.front().getCallsignAndControllerRealName(); } if (f2Stations.size() == 1) { - f1 += QStringLiteral(" ") % f2Stations.front().getCallsignAndControllerRealName(); + f1 += u' ' % f2Stations.front().getCallsignAndControllerRealName(); } ui->tb_TextMessagesCOM1->setToolTip(f1); diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index cf85659e8..c00f29743 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -264,7 +264,7 @@ namespace BlackGui QString CGuiApplication::setExtraWindowTitle(const QString &extraInfo, QWidget *mainWindowWidget) const { QString name(this->getApplicationNameVersionDetailed()); - if (!extraInfo.isEmpty()) { name = extraInfo % QStringLiteral(" ") % name; } + if (!extraInfo.isEmpty()) { name = extraInfo % u' ' % name; } if (!mainWindowWidget) { return name; } mainWindowWidget->setWindowTitle(name); return name; diff --git a/src/blackgui/models/actionmodel.cpp b/src/blackgui/models/actionmodel.cpp index 2e2edf44f..652135433 100644 --- a/src/blackgui/models/actionmodel.cpp +++ b/src/blackgui/models/actionmodel.cpp @@ -114,7 +114,7 @@ namespace BlackGui CActionItem *parentItem = m_rootItem.data(); for (const auto &token : tokens) { - currentPath += QLatin1Char('/') % token; + currentPath += u'/' % token; CActionItem *child = parentItem->findChildByName(token); if (child == nullptr) { diff --git a/src/blackmisc/applicationinfo.cpp b/src/blackmisc/applicationinfo.cpp index a54906515..cdbaa2f71 100644 --- a/src/blackmisc/applicationinfo.cpp +++ b/src/blackmisc/applicationinfo.cpp @@ -85,9 +85,9 @@ namespace BlackMisc QString CApplicationInfo::asOtherSwiftVersionString(const QString &separator) const { - return QStringLiteral("Version; ") % this->getVersionString() % QStringLiteral(" os: ") % this->getPlatform() % separator % - QStringLiteral("exe.path: ") % this->getExecutablePath() % separator % - QStringLiteral("app.data: ") % this->getApplicationDataDirectory(); + return u"Version; " % this->getVersionString() % u" os: " % this->getPlatform() % separator % + u"exe.path: " % this->getExecutablePath() % separator % + u"app.data: " % this->getApplicationDataDirectory(); } QString CApplicationInfo::convertToQString(bool i18n) const diff --git a/src/blackmisc/audio/audiodeviceinfo.cpp b/src/blackmisc/audio/audiodeviceinfo.cpp index 132d6bc7f..9fcc5c941 100644 --- a/src/blackmisc/audio/audiodeviceinfo.cpp +++ b/src/blackmisc/audio/audiodeviceinfo.cpp @@ -31,7 +31,7 @@ namespace BlackMisc { Q_UNUSED(i18n); if (m_hostName.isEmpty()) { return m_deviceName; } - return m_deviceName % QStringLiteral(" [") % this->getHostName() % QStringLiteral("]"); + return m_deviceName % u" [" % this->getHostName() % u']'; } } // Voice } // BlackMisc diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index 3dac8435a..1bbe48a6b 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -75,7 +75,7 @@ namespace BlackMisc QString CAircraftIcaoCode::getDesignatorDbKey() const { return (this->isLoadedFromDb()) ? - this->getDesignator() % QStringLiteral(" ") % this->getDbKeyAsStringInParentheses() : + this->getDesignator() % u' ' % this->getDbKeyAsStringInParentheses() : this->getDesignator(); } @@ -399,7 +399,7 @@ namespace BlackMisc QString CAircraftIcaoCode::getDesignatorManufacturer() const { return (this->hasDesignator() ? this->getDesignator() : QStringLiteral("????")) % - (this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QString()); + (this->hasManufacturer() ? (u' ' % this->getManufacturer()) : QString()); } bool CAircraftIcaoCode::hasManufacturer() const @@ -478,28 +478,28 @@ namespace BlackMisc QString CAircraftIcaoCode::getCombinedIcaoStringWithKey() const { return (this->hasDesignator() ? this->getDesignator() : QStringLiteral("????")) % - (this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QString()) % - (this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QString()) % + (this->hasManufacturer() ? (u' ' % this->getManufacturer()) : QString()) % + (this->hasModelDescription() ? (u' ' % this->getModelDescription()) : QString()) % this->getDbKeyAsStringInParentheses(" "); } QString CAircraftIcaoCode::getCombinedIataStringWithKey() const { if (!this->hasIataCode()) { return ""; } - return this->getIataCode() % QStringLiteral(" [IATA") % - (this->hasDesignator() ? (QStringLiteral(" ") % this->getDesignator()) : QString()) % - (this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QString()) % - (this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QString()) % + return this->getIataCode() % u" [IATA" % + (this->hasDesignator() ? (u' ' % this->getDesignator()) : QString()) % + (this->hasManufacturer() ? (u' ' % this->getManufacturer()) : QString()) % + (this->hasModelDescription() ? (u' ' % this->getModelDescription()) : QString()) % this->getDbKeyAsStringInParentheses(" "); } QString CAircraftIcaoCode::getCombinedFamilyStringWithKey() const { if (!this->hasFamily()) { return ""; } - return this->getFamily() % QStringLiteral(" [family") % - (this->hasDesignator() ? (QStringLiteral(" ") % this->getDesignator()) : QString()) % - (this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QString()) % - (this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QString()) % + return this->getFamily() % u" [family" % + (this->hasDesignator() ? (u' ' % this->getDesignator()) : QString()) % + (this->hasManufacturer() ? (u' ' % this->getManufacturer()) : QString()) % + (this->hasModelDescription() ? (u' ' % this->getModelDescription()) : QString()) % this->getDbKeyAsStringInParentheses(" "); } @@ -745,10 +745,10 @@ namespace BlackMisc } // turn E to P engine - if (combinedCode.endsWith("E")) { return QStringList({ combinedCode.leftRef(2) % QStringLiteral("P")}); } + if (combinedCode.endsWith("E")) { return QStringList({ combinedCode.leftRef(2) % u'P' }); } // turn T to H plane (tilt wing to helicopter - if (combinedCode.startsWith("T")) { return QStringList({ QStringLiteral("H") % combinedCode.rightRef(2)}); } + if (combinedCode.startsWith("T")) { return QStringList({ u'H' % combinedCode.rightRef(2)}); } // based on engine count QStringList codes; @@ -773,18 +773,18 @@ namespace BlackMisc return CAircraftIcaoCode(); } - const QString designator(json.value(prefix % QStringLiteral("designator")).toString()); - const QString iata(json.value(prefix % QStringLiteral("iata")).toString()); - const QString family(json.value(prefix % QStringLiteral("family")).toString()); - const QString manufacturer(json.value(prefix % QStringLiteral("manufacturer")).toString()); - const QString model(json.value(prefix % QStringLiteral("model")).toString()); - const QString modelIata(json.value(prefix % QStringLiteral("modeliata")).toString()); - const QString modelSwift(json.value(prefix % QStringLiteral("modelswift")).toString()); - const QString type(json.value(prefix % QStringLiteral("type")).toString()); - const QString engine(json.value(prefix % QStringLiteral("engine")).toString()); - const int engineCount(json.value(prefix % QStringLiteral("enginecount")).toInt(-1)); + const QString designator(json.value(prefix % u"designator").toString()); + const QString iata(json.value(prefix % u"iata").toString()); + const QString family(json.value(prefix % u"family").toString()); + const QString manufacturer(json.value(prefix % u"manufacturer").toString()); + const QString model(json.value(prefix % u"model").toString()); + const QString modelIata(json.value(prefix % u"modeliata").toString()); + const QString modelSwift(json.value(prefix % u"modelswift").toString()); + const QString type(json.value(prefix % u"type").toString()); + const QString engine(json.value(prefix % u"engine").toString()); + const int engineCount(json.value(prefix % u"enginecount").toInt(-1)); const QString combined(createdCombinedString(type, engineCount, engine)); - QString wtc(json.value(prefix % QStringLiteral("wtc")).toString()); + QString wtc(json.value(prefix % u"wtc").toString()); if (wtc.length() > 1 && wtc.contains("/")) { // "L/M" -> "M" @@ -792,10 +792,10 @@ namespace BlackMisc } Q_ASSERT_X(wtc.length() < 2, Q_FUNC_INFO, "WTC too long"); - const bool real = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("realworld")).toString()); - const bool legacy = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("legacy")).toString()); - const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("military")).toString()); - const int rank(json.value(prefix % QStringLiteral("rank")).toInt(10)); + const bool real = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % u"realworld").toString()); + const bool legacy = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % u"legacy").toString()); + const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % u"military").toString()); + const int rank(json.value(prefix % u"rank").toInt(10)); CAircraftIcaoCode code( designator, iata, family, combined, manufacturer, diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp index ff40aae92..829706b01 100644 --- a/src/blackmisc/aviation/aircraftlights.cpp +++ b/src/blackmisc/aviation/aircraftlights.cpp @@ -87,14 +87,14 @@ namespace BlackMisc QString CAircraftLights::convertToQString(bool i18n) const { Q_UNUSED(i18n); - const QString s = QLatin1String("strobe: ") % boolToYesNo(m_strobeOn) % - QLatin1String(" landing: ") % boolToYesNo(m_landingOn) % - QLatin1String(" taxi: ") % boolToYesNo(m_taxiOn) % - QLatin1String(" beacon: ") % boolToYesNo(m_beaconOn) % - QLatin1String(" nav: ") % boolToYesNo(m_navOn) % - QLatin1String(" logo: ") % boolToYesNo(m_logoOn) % - QLatin1String(" recognition: ") % boolToYesNo(m_recognition) % - QLatin1String(" cabin: ") % boolToYesNo(m_cabin); + const QString s = u"strobe: " % boolToYesNo(m_strobeOn) % + u" landing: " % boolToYesNo(m_landingOn) % + u" taxi: " % boolToYesNo(m_taxiOn) % + u" beacon: " % boolToYesNo(m_beaconOn) % + u" nav: " % boolToYesNo(m_navOn) % + u" logo: " % boolToYesNo(m_logoOn) % + u" recognition: " % boolToYesNo(m_recognition) % + u" cabin: " % boolToYesNo(m_cabin); return s; } diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index d45b605c8..ec9ee1f65 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -44,15 +44,15 @@ namespace BlackMisc QString CAircraftParts::convertToQString(bool i18n) const { - return QStringLiteral("ts: ") % this->getFormattedTimestampAndOffset(true) % - QStringLiteral(" details: ") % this->getPartsDetailsAsString() % - (m_guessingDetails.isEmpty() ? QString() : QStringLiteral(" - ") % m_guessingDetails) % - QStringLiteral(" | on ground: ") % BlackMisc::boolToYesNo(m_isOnGround) % - QStringLiteral(" | lights: ") % m_lights.toQString(i18n) % - QStringLiteral(" | gear down: ") % BlackMisc::boolToYesNo(m_gearDown) % - QStringLiteral(" | flaps pct: ") % QString::number(m_flapsPercentage) % - QStringLiteral(" | spoilers out: ") % BlackMisc::boolToYesNo(m_spoilersOut) % - QStringLiteral(" | engines on: ") % m_engines.toQString(i18n); + return u"ts: " % this->getFormattedTimestampAndOffset(true) % + u" details: " % this->getPartsDetailsAsString() % + (m_guessingDetails.isEmpty() ? QString() : u" - " % m_guessingDetails) % + u" | on ground: " % BlackMisc::boolToYesNo(m_isOnGround) % + u" | lights: " % m_lights.toQString(i18n) % + u" | gear down: " % BlackMisc::boolToYesNo(m_gearDown) % + u" | flaps pct: " % QString::number(m_flapsPercentage) % + u" | spoilers out: " % BlackMisc::boolToYesNo(m_spoilersOut) % + u" | engines on: " % m_engines.toQString(i18n); } QJsonObject CAircraftParts::toIncrementalJson() const @@ -130,13 +130,13 @@ namespace BlackMisc const CSpeed slowSpeed = guessedVRotate * 0.30; if (situation.getGroundSpeed() < slowSpeed) { - if (details) { *details += QStringLiteral("slow speed <") % slowSpeed.valueRoundedWithUnit(1) % QStringLiteral(" on ground"); } + if (details) { *details += u"slow speed <" % slowSpeed.valueRoundedWithUnit(1) % u" on ground"; } parts.setFlapsPercent(0); break; } else { - if (details) { *details += QStringLiteral("faster speed >") % slowSpeed.valueRoundedWithUnit(1) % QStringLiteral(" on ground"); } + if (details) { *details += u"faster speed >" % slowSpeed.valueRoundedWithUnit(1) % u" on ground"; } parts.setFlapsPercent(0); break; } diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index 2949fc134..2bd87dba1 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -67,24 +67,24 @@ namespace BlackMisc QString CAircraftSituation::convertToQString(bool i18n) const { - return QStringLiteral("ts: ") % this->getFormattedTimestampAndOffset(true) % - QStringLiteral(" | ") % m_position.toQString(i18n) % - QStringLiteral(" | alt: ") % this->getAltitude().valueRoundedWithUnit(CLengthUnit::ft(), 1) % - QStringLiteral(" ") % this->getCorrectedAltitude().valueRoundedWithUnit(CLengthUnit::ft(), 1) % - QStringLiteral("[cor] | og: ") % this->getOnGroundInfo() % - (m_onGroundGuessingDetails.isEmpty() ? QString() : QStringLiteral(" ") % m_onGroundGuessingDetails) % - QStringLiteral(" | cg: ") % - (m_cg.isNull() ? QStringLiteral("null") : m_cg.valueRoundedWithUnit(CLengthUnit::m(), 1) % QStringLiteral(" ") % m_cg.valueRoundedWithUnit(CLengthUnit::ft(), 1)) % - QStringLiteral(" | offset: ") % - (m_sceneryOffset.isNull() ? QStringLiteral("null") : m_sceneryOffset.valueRoundedWithUnit(CLengthUnit::m(), 1) % QStringLiteral(" ") % m_sceneryOffset.valueRoundedWithUnit(CLengthUnit::ft(), 1)) % - QStringLiteral(" | factor [0..1]: ") % QString::number(m_onGroundFactor, 'f', 2) % - QStringLiteral(" | skip ng: ") % boolToYesNo(this->canLikelySkipNearGroundInterpolation()) % - QStringLiteral(" | bank: ") % m_bank.toQString(i18n) % - QStringLiteral(" | pitch: ") % m_pitch.toQString(i18n) % - QStringLiteral(" | heading: ") % m_heading.toQString(i18n) % - QStringLiteral(" | gs: ") % m_groundSpeed.valueRoundedWithUnit(CSpeedUnit::kts(), 1, true) % - QStringLiteral(" ") % m_groundSpeed.valueRoundedWithUnit(CSpeedUnit::m_s(), 1, true) % - QStringLiteral(" | elevation [") % this->getGroundElevationInfoAsString() % QStringLiteral("]: ") % (m_groundElevationPlane.toQString(i18n)); + return u"ts: " % this->getFormattedTimestampAndOffset(true) % + u" | " % m_position.toQString(i18n) % + u" | alt: " % this->getAltitude().valueRoundedWithUnit(CLengthUnit::ft(), 1) % + u' ' % this->getCorrectedAltitude().valueRoundedWithUnit(CLengthUnit::ft(), 1) % + u"[cor] | og: " % this->getOnGroundInfo() % + (m_onGroundGuessingDetails.isEmpty() ? QString() : u' ' % m_onGroundGuessingDetails) % + u" | cg: " % + (m_cg.isNull() ? QStringLiteral("null") : m_cg.valueRoundedWithUnit(CLengthUnit::m(), 1) % u' ' % m_cg.valueRoundedWithUnit(CLengthUnit::ft(), 1)) % + u" | offset: " % + (m_sceneryOffset.isNull() ? QStringLiteral("null") : m_sceneryOffset.valueRoundedWithUnit(CLengthUnit::m(), 1) % u' ' % m_sceneryOffset.valueRoundedWithUnit(CLengthUnit::ft(), 1)) % + u" | factor [0..1]: " % QString::number(m_onGroundFactor, 'f', 2) % + u" | skip ng: " % boolToYesNo(this->canLikelySkipNearGroundInterpolation()) % + u" | bank: " % m_bank.toQString(i18n) % + u" | pitch: " % m_pitch.toQString(i18n) % + u" | heading: " % m_heading.toQString(i18n) % + u" | gs: " % m_groundSpeed.valueRoundedWithUnit(CSpeedUnit::kts(), 1, true) % + u' ' % m_groundSpeed.valueRoundedWithUnit(CSpeedUnit::m_s(), 1, true) % + u" | elevation [" % this->getGroundElevationInfoAsString() % u"]: " % (m_groundElevationPlane.toQString(i18n)); } const QString &CAircraftSituation::isOnGroundToString(CAircraftSituation::IsOnGround onGround) @@ -590,7 +590,7 @@ namespace BlackMisc // "extreme" values for which we are surely not on ground if (qAbs(this->getPitch().value(CAngleUnit::deg())) > 20) { if (details) { *details = QStringLiteral("max.pitch"); }; return true; } // some tail wheel aircraft already have 11° pitch on ground if (qAbs(this->getBank().value(CAngleUnit::deg())) > 10) { if (details) { *details = QStringLiteral("max.bank"); }; return true; } - if (this->getGroundSpeed() > sureRotateSpeed) { if (details) { *details = QStringLiteral("gs. > vr ") % sureRotateSpeed.valueRoundedWithUnit(1); }; return true; } + if (this->getGroundSpeed() > sureRotateSpeed) { if (details) { *details = u"gs. > vr " % sureRotateSpeed.valueRoundedWithUnit(1); }; return true; } // use the most accurate or reliable guesses here first // ------------------------------------------------------ @@ -710,7 +710,7 @@ namespace BlackMisc QString CAircraftSituation::getOnGroundInfo() const { - return this->onGroundAsString() % QLatin1Char(' ') % this->getOnGroundDetailsAsString(); + return this->onGroundAsString() % u' ' % this->getOnGroundDetailsAsString(); } CAircraftSituation::GndElevationInfo CAircraftSituation::getGroundElevationInfo() const @@ -722,7 +722,7 @@ namespace BlackMisc QString CAircraftSituation::getGroundElevationInfoAsString() const { return m_isElvInfoTransferred ? - QStringLiteral("tx: ") % gndElevationInfoToString(this->getGroundElevationInfo()) : + u"tx: " % gndElevationInfoToString(this->getGroundElevationInfo()) : gndElevationInfoToString(this->getGroundElevationInfo()); } @@ -732,7 +732,7 @@ namespace BlackMisc if (m_groundElevationPlane.isNull()) { return n; }; return m_groundElevationPlane.getAltitude().toQString(true) % - QStringLiteral(" [") % this->getGroundElevationInfoAsString() % QStringLiteral("]"); + u" [" % this->getGroundElevationInfoAsString() % u']'; } bool CAircraftSituation::canTransferGroundElevation(const CAircraftSituation &transferToSituation, const CLength &radius) const diff --git a/src/blackmisc/aviation/aircraftsituationchange.cpp b/src/blackmisc/aviation/aircraftsituationchange.cpp index 1de0c0540..ad305a10d 100644 --- a/src/blackmisc/aviation/aircraftsituationchange.cpp +++ b/src/blackmisc/aviation/aircraftsituationchange.cpp @@ -111,23 +111,23 @@ namespace BlackMisc Q_UNUSED(i18n); static const QString null("null"); if (this->isNull()) { return null; } - return QStringLiteral("CS: '") % this->getCallsign().asString() % - QStringLiteral(" ' ts: ") % this->getTimestampAndOffset(true) % - QStringLiteral(" | situations:") % QString::number(m_situationsCount) % - QStringLiteral(" | ts adj.: ") % QString::number(m_oldestAdjustedTimestampMSecsSinceEpoch) % QStringLiteral("-") % QString::number(m_latestAdjustedTimestampMSecsSinceEpoch) % - QStringLiteral(" | just takeoff: ") % boolToYesNo(this->isJustTakingOff()) % QStringLiteral(" just touchdown: ") % boolToYesNo(this->isJustTouchingDown()) % - QStringLiteral(" | all gnd: ") % boolToYesNo(this->isConstOnGround()) % QStringLiteral("/") % boolToYesNo(this->wasConstOnGround()) % - QStringLiteral(" | all not gnd: ") % boolToYesNo(this->isConstNotOnGround()) % QStringLiteral("/") % boolToYesNo(this->wasConstNotOnGround()) % - QStringLiteral(" | ascending: ") % boolToYesNo(this->isConstAscending()) % QStringLiteral(" descending: ") % boolToYesNo(this->isConstDescending()) % - QStringLiteral(" | accelerating.: ") % boolToYesNo(this->isConstAccelerating()) % QStringLiteral(" decelarating: ") % boolToYesNo(this->isConstDecelarating()) % - QStringLiteral(" | rotate up: ") % boolToYesNo(this->isRotatingUp()) % - QStringLiteral(" | push back: ") % boolToYesNo(this->containsPushBack()) % - QStringLiteral(" | scenery delta: ") % m_guessedSceneryDeviation.valueRoundedWithUnit(1) % QStringLiteral(" [") % this->getSceneryDeviationHintAsString() % - QStringLiteral("] | AGL delta: ") % m_gndDistMean.valueRoundedWithUnit(1) % QStringLiteral("/") % m_gndDistStdDev.valueRoundedWithUnit(1) % - QStringLiteral(" | std.dev/mean: pitch ") % m_pitchMean.valueRoundedWithUnit(1) % QStringLiteral("/") % m_pitchStdDev.valueRoundedWithUnit(1) % - QStringLiteral(" gs ") % m_gsMean.valueRoundedWithUnit(1) % QStringLiteral("/") % m_gsStdDev.valueRoundedWithUnit(1) % - QStringLiteral(" alt. ") % m_altMean.valueRoundedWithUnit(1) % QStringLiteral("/") % m_altStdDev.valueRoundedWithUnit(1) % - QStringLiteral(" elv. ") % m_elvMean.valueRoundedWithUnit(1) % QStringLiteral("/") % m_elvStdDev.valueRoundedWithUnit(1); + return u"CS: '" % this->getCallsign().asString() % + u" ' ts: " % this->getTimestampAndOffset(true) % + u" | situations:" % QString::number(m_situationsCount) % + u" | ts adj.: " % QString::number(m_oldestAdjustedTimestampMSecsSinceEpoch) % u'-' % QString::number(m_latestAdjustedTimestampMSecsSinceEpoch) % + u" | just takeoff: " % boolToYesNo(this->isJustTakingOff()) % u" just touchdown: " % boolToYesNo(this->isJustTouchingDown()) % + u" | all gnd: " % boolToYesNo(this->isConstOnGround()) % u'/' % boolToYesNo(this->wasConstOnGround()) % + u" | all not gnd: " % boolToYesNo(this->isConstNotOnGround()) % u'/' % boolToYesNo(this->wasConstNotOnGround()) % + u" | ascending: " % boolToYesNo(this->isConstAscending()) % u" descending: " % boolToYesNo(this->isConstDescending()) % + u" | accelerating.: " % boolToYesNo(this->isConstAccelerating()) % u" decelarating: " % boolToYesNo(this->isConstDecelarating()) % + u" | rotate up: " % boolToYesNo(this->isRotatingUp()) % + u" | push back: " % boolToYesNo(this->containsPushBack()) % + u" | scenery delta: " % m_guessedSceneryDeviation.valueRoundedWithUnit(1) % u" [" % this->getSceneryDeviationHintAsString() % + u"] | AGL delta: " % m_gndDistMean.valueRoundedWithUnit(1) % u'/' % m_gndDistStdDev.valueRoundedWithUnit(1) % + u" | std.dev/mean: pitch " % m_pitchMean.valueRoundedWithUnit(1) % u'/' % m_pitchStdDev.valueRoundedWithUnit(1) % + u" gs " % m_gsMean.valueRoundedWithUnit(1) % u'/' % m_gsStdDev.valueRoundedWithUnit(1) % + u" alt. " % m_altMean.valueRoundedWithUnit(1) % u'/' % m_altStdDev.valueRoundedWithUnit(1) % + u" elv. " % m_elvMean.valueRoundedWithUnit(1) % u'/' % m_elvStdDev.valueRoundedWithUnit(1); } CVariant CAircraftSituationChange::propertyByIndex(const CPropertyIndex &index) const diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index 93256ebc2..07919d36a 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -60,7 +60,7 @@ namespace BlackMisc const QString CAirlineIcaoCode::getVDesignator() const { if (!this->isVirtualAirline()) { return m_designator; } - return QLatin1Char('V') % m_designator; + return u'V' % m_designator; } QString CAirlineIcaoCode::getVDesignatorDbKey() const @@ -91,8 +91,8 @@ namespace BlackMisc QString CAirlineIcaoCode::getDesignatorNameCountry() const { return this->getDesignator() % - (this->hasName() ? (QStringLiteral(" ") % this->getName()) : QString()) % - (this->hasValidCountry() ? (QStringLiteral(" ") % this->getCountryIso()) : QString()); + (this->hasName() ? (u' ' % this->getName()) : QString()) % + (this->hasValidCountry() ? (u' ' % this->getCountryIso()) : QString()); } QString CAirlineIcaoCode::getSimplifiedName() const @@ -185,10 +185,10 @@ namespace BlackMisc { Q_UNUSED(i18n); return this->getDesignatorDbKey() % - (this->hasName() ? QStringLiteral(" ") % m_name : QString()) % - QStringLiteral(" Op: ") % boolToYesNo(this->isOperating()) % - QStringLiteral(" VA: ") % boolToYesNo(this->isVirtualAirline()) % - QStringLiteral(" Mil: ") % boolToYesNo(this->isMilitary()); + (this->hasName() ? u' ' % m_name : QString()) % + u" Op: " % boolToYesNo(this->isOperating()) % + u" VA: " % boolToYesNo(this->isVirtualAirline()) % + u" Mil: " % boolToYesNo(this->isMilitary()); } CVariant CAirlineIcaoCode::propertyByIndex(const CPropertyIndex &index) const @@ -303,7 +303,7 @@ namespace BlackMisc QString CAirlineIcaoCode::getCombinedStringWithKey() const { return (this->hasValidDesignator() ? this->getVDesignator() : QString()) % - (this->hasName() ? QStringLiteral(" ") % m_name : QString()) % + (this->hasName() ? u' ' % m_name : QString()) % this->getDbKeyAsStringInParentheses(" "); } @@ -427,23 +427,23 @@ namespace BlackMisc return CAirlineIcaoCode(); } - QString designator(json.value(prefix % QStringLiteral("designator")).toString()); + QString designator(json.value(prefix % u"designator").toString()); if (!CAirlineIcaoCode::isValidAirlineDesignator(designator)) { designator = CAirlineIcaoCode::normalizeDesignator(designator); } - const QString iata(json.value(prefix % QStringLiteral("iata")).toString()); - const QString telephony(json.value(prefix % QStringLiteral("callsign")).toString()); - const QString name(json.value(prefix % QStringLiteral("name")).toString()); - const QString countryIso(json.value(prefix % QStringLiteral("country")).toString()); - const QString countryName(json.value(prefix % QStringLiteral("countryname")).toString()); - const QString groupName(json.value(prefix % QStringLiteral("groupname")).toString()); - const QString groupDesignator(json.value(prefix % QStringLiteral("groupdesignator")).toString()); - const int groupId(json.value(prefix % QStringLiteral("groupid")).toInt(-1)); - const bool va = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("va")).toString()); - const bool operating = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("operating")).toString()); - const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("military")).toString()); + const QString iata(json.value(prefix % u"iata").toString()); + const QString telephony(json.value(prefix % u"callsign").toString()); + const QString name(json.value(prefix % u"name").toString()); + const QString countryIso(json.value(prefix % u"country").toString()); + const QString countryName(json.value(prefix % u"countryname").toString()); + const QString groupName(json.value(prefix % u"groupname").toString()); + const QString groupDesignator(json.value(prefix % u"groupdesignator").toString()); + const int groupId(json.value(prefix % u"groupid").toInt(-1)); + const bool va = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % u"va").toString()); + const bool operating = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % u"operating").toString()); + const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % u"military").toString()); CAirlineIcaoCode code( designator, name, diff --git a/src/blackmisc/aviation/airport.cpp b/src/blackmisc/aviation/airport.cpp index 60aee4da3..0b0b2432a 100644 --- a/src/blackmisc/aviation/airport.cpp +++ b/src/blackmisc/aviation/airport.cpp @@ -46,7 +46,7 @@ namespace BlackMisc if (m_location.isEmpty()) { return this->getDescriptiveName(); } if (m_descriptiveName.isEmpty()) { return this->getLocation(); } if (this->getDescriptiveName() == this->getLocation()) { return this->getLocation(); } - return this->getLocation() % QStringLiteral(" (") % this->getDescriptiveName() % QStringLiteral(")"); + return this->getLocation() % u" (" % this->getDescriptiveName() % u')'; } bool CAirport::matchesLocation(const QString &location) const diff --git a/src/blackmisc/aviation/altitude.cpp b/src/blackmisc/aviation/altitude.cpp index 73cbe117d..a82e286a8 100644 --- a/src/blackmisc/aviation/altitude.cpp +++ b/src/blackmisc/aviation/altitude.cpp @@ -85,7 +85,7 @@ namespace BlackMisc else { return this->CLength::valueRoundedWithUnit(1, i18n) % - (this->isMeanSeaLevel() ? QStringLiteral(" MSL") : QStringLiteral(" AGL")); + (this->isMeanSeaLevel() ? u" MSL" : u" AGL"); } } diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp index a41c08413..86ae82b7f 100644 --- a/src/blackmisc/aviation/atcstation.cpp +++ b/src/blackmisc/aviation/atcstation.cpp @@ -85,7 +85,7 @@ namespace BlackMisc { if (m_callsign.isEmpty()) { return this->getControllerRealName(); } if (!m_controller.hasRealName()) { return m_callsign.asString(); } - return m_callsign.asString() % QStringLiteral(" ") % this->getControllerRealName(); + return m_callsign.asString() % u' ' % this->getControllerRealName(); } void CAtcStation::setController(const CUser &controller) @@ -101,43 +101,43 @@ namespace BlackMisc static const QString fromUtcI18n(QCoreApplication::translate("Aviation", "from(UTC)")); static const QString untilUtcI18n(QCoreApplication::translate("Aviation", "until(UTC)")); - const QString s = (i18n ? atcI18n : QLatin1String("ATC station")) % - QLatin1Char(' ') % m_callsign.toQString(i18n) % - QLatin1Char(' ') % m_position.toQString(i18n) % - QLatin1String(" online: ") % boolToYesNo(m_isOnline) % + const QString s = (i18n ? atcI18n : QStringLiteral("ATC station")) % + u' ' % m_callsign.toQString(i18n) % + u' ' % m_position.toQString(i18n) % + u" online: " % boolToYesNo(m_isOnline) % // controller (m_controller.isNull() ? QString() : - QStringLiteral(" ") % m_controller.toQString(i18n)) % + u' ' % m_controller.toQString(i18n)) % // frequency - QLatin1Char(' ') % m_frequency.valueRoundedWithUnit(3, i18n) % + u' ' % m_frequency.valueRoundedWithUnit(3, i18n) % // ATIS (!this->hasAtis() ? QString() : - QStringLiteral(" ") % m_atis.toQString(i18n)) % + u' ' % m_atis.toQString(i18n)) % // METAR (!this->hasMetar() ? QString() : - QStringLiteral(" ") % m_metar.toQString(i18n)) % + u' ' % m_metar.toQString(i18n)) % // range - QLatin1Char(' ') % (i18n ? rangeI18n : QLatin1String("range")) % - QLatin1Char(' ') % m_range.toQString(i18n) % + u' ' % (i18n ? rangeI18n : QStringLiteral("range")) % + u' ' % m_range.toQString(i18n) % // distance / bearing - QLatin1Char(' ') % ICoordinateWithRelativePosition::convertToQString(i18n) % + u' ' % ICoordinateWithRelativePosition::convertToQString(i18n) % // booking from/until - QLatin1Char(' ') % - (i18n ? fromUtcI18n : QLatin1String("from(UTC)")) % - QLatin1Char(' ') % - (m_bookedFromUtc.isNull() ? QLatin1String("-") : m_bookedFromUtc.toString("yy-MM-dd HH:mm")) % + u' ' % + (i18n ? fromUtcI18n : QStringLiteral("from(UTC)")) % + u' ' % + (m_bookedFromUtc.isNull() ? QStringLiteral("-") : m_bookedFromUtc.toString("yy-MM-dd HH:mm")) % - QLatin1Char(' ') % - (i18n ? untilUtcI18n : QLatin1String("until(UTC)")) % - QLatin1Char(' ') % - (m_bookedUntilUtc.isNull() ? QLatin1String("-") : m_bookedUntilUtc.toString("yy-MM-dd HH:mm")); + u' ' % + (i18n ? untilUtcI18n : QStringLiteral("until(UTC)")) % + u' ' % + (m_bookedUntilUtc.isNull() ? QStringLiteral("-") : m_bookedUntilUtc.toString("yy-MM-dd HH:mm")); return s; diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp index 8c387fccf..05c2f066f 100644 --- a/src/blackmisc/aviation/flightplan.cpp +++ b/src/blackmisc/aviation/flightplan.cpp @@ -65,12 +65,12 @@ namespace BlackMisc QString CFlightPlanRemarks::convertToQString(bool i18n) const { const QString s = - (m_registration.isEmpty() ? QString() : QStringLiteral("reg.: ") % m_registration.toQString(i18n)) - % (!this->hasValidAirlineIcao() ? QString() : QStringLiteral(" airline: ") % m_airlineIcao.getDesignator()) - % (m_radioTelephony.isEmpty() ? QString() : QStringLiteral(" radio tel.:") % m_radioTelephony) - % (m_flightOperator.isEmpty() ? QString() : QStringLiteral(" operator: ") % m_flightOperator) - % (!m_selcalCode.isValid() ? QString() : QStringLiteral(" SELCAL: ") % m_selcalCode.getCode()) - % QStringLiteral(" voice: ") % m_voiceCapabilities.toQString(i18n); + (m_registration.isEmpty() ? QString() : u"reg.: " % m_registration.toQString(i18n)) + % (!this->hasValidAirlineIcao() ? QString() : u" airline: " % m_airlineIcao.getDesignator()) + % (m_radioTelephony.isEmpty() ? QString() : u" radio tel.:" % m_radioTelephony) + % (m_flightOperator.isEmpty() ? QString() : u" operator: " % m_flightOperator) + % (!m_selcalCode.isValid() ? QString() : u" SELCAL: " % m_selcalCode.getCode()) + % u" voice: " % m_voiceCapabilities.toQString(i18n); return s.simplified().trimmed(); } @@ -89,7 +89,7 @@ namespace BlackMisc if (r.contains("/V/", Qt::CaseInsensitive)) { r.replace("/V/", newCapRemarks, Qt::CaseInsensitive); return r; } if (r.contains("/R/", Qt::CaseInsensitive)) { r.replace("/R/", newCapRemarks, Qt::CaseInsensitive); return r; } if (r.contains("/T/", Qt::CaseInsensitive)) { r.replace("/T/", newCapRemarks, Qt::CaseInsensitive); return r; } - return newCapRemarks % QStringLiteral(" ") % r; + return newCapRemarks % u' ' % r; } QString CFlightPlanRemarks::cleanRemarks(const QString &remarksIn) @@ -282,18 +282,18 @@ namespace BlackMisc QString CFlightPlan::convertToQString(bool i18n) const { const QString s = m_callsign.toQString(i18n) - % QLatin1Char(' ') % m_equipmentSuffix - % QLatin1Char(' ') % m_originAirportIcao.toQString(i18n) - % QLatin1Char(' ') % m_destinationAirportIcao.toQString(i18n) - % QLatin1Char(' ') % m_alternateAirportIcao.toQString(i18n) - % QLatin1Char(' ') % m_takeoffTimePlanned.toString("ddhhmm") - % QLatin1Char(' ') % m_takeoffTimeActual.toString("ddhhmm") - % QLatin1Char(' ') % m_enrouteTime.toQString(i18n) - % QLatin1Char(' ') % m_fuelTime.toQString(i18n) - % QLatin1Char(' ') % m_cruiseAltitude.toQString(i18n) - % QLatin1Char(' ') % m_cruiseTrueAirspeed.toQString(i18n) - % QLatin1Char(' ') % m_route - % QLatin1Char(' ') % this->getRemarks(); + % u' ' % m_equipmentSuffix + % u' ' % m_originAirportIcao.toQString(i18n) + % u' ' % m_destinationAirportIcao.toQString(i18n) + % u' ' % m_alternateAirportIcao.toQString(i18n) + % u' ' % m_takeoffTimePlanned.toString("ddhhmm") + % u' ' % m_takeoffTimeActual.toString("ddhhmm") + % u' ' % m_enrouteTime.toQString(i18n) + % u' ' % m_fuelTime.toQString(i18n) + % u' ' % m_cruiseAltitude.toQString(i18n) + % u' ' % m_cruiseTrueAirspeed.toQString(i18n) + % u' ' % m_route + % u' ' % this->getRemarks(); return s; } @@ -587,11 +587,11 @@ namespace BlackMisc QString s = prefix; if (!icao.isEmpty()) { - s += (s.isEmpty() ? QString() : QStringLiteral("/")) % icao; + s += (s.isEmpty() ? u"" : u"/") % icao; } if (suffix.isEmpty()) { return s; } if (s.isEmpty()) { return suffix; } - return s % QStringLiteral("/") % suffix; + return s % u'/' % suffix; } CFlightPlan::FlightRules CFlightPlan::stringToFlightRules(const QString &flightRules) diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index a97917395..601b44404 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -72,7 +72,7 @@ namespace BlackMisc return this->getCombinedCode() % ( this->getDescription().isEmpty() ? QString() : - (QStringLiteral(" ") % this->getDescription()) + (u' ' % this->getDescription()) ); } @@ -134,12 +134,12 @@ namespace BlackMisc static const QString liveryI18n(QCoreApplication::translate("Aviation", "Livery")); return (i18n ? liveryI18n : livery) % - QLatin1String(" cc: '") % m_combinedCode % - QLatin1String("' airline: '") % m_airline.toQString(i18n) % - QLatin1String("' desc.: '") % m_description % - QLatin1String("' F: '") % m_colorFuselage.hex() % - QLatin1String("' T: '") % m_colorTail.hex() % - QLatin1String("' Mil: ") % boolToYesNo(this->isMilitary()); + u" cc: '" % m_combinedCode % + u"' airline: '" % m_airline.toQString(i18n) % + u"' desc.: '" % m_description % + u"' F: '" % m_colorFuselage.hex() % + u"' T: '" % m_colorTail.hex() % + u"' Mil: " % boolToYesNo(this->isMilitary()); // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("Aviation", "Livery"); @@ -239,7 +239,7 @@ namespace BlackMisc return CLivery(); } - const QString combinedCode(json.value(prefix % QStringLiteral("combinedcode")).toString()); + const QString combinedCode(json.value(prefix % u"combinedcode").toString()); if (combinedCode.isEmpty()) { CLivery liveryStub; // only consists of id, maybe key and timestamp @@ -248,10 +248,10 @@ namespace BlackMisc } const bool isColorLivery = combinedCode.startsWith(colorLiveryMarker()); - const QString description(json.value(prefix % QStringLiteral("description")).toString()); - const CRgbColor colorFuselage(json.value(prefix % QStringLiteral("colorfuselage")).toString()); - const CRgbColor colorTail(json.value(prefix % QStringLiteral("colortail")).toString()); - const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("military")).toString()); + const QString description(json.value(prefix % u"description").toString()); + const CRgbColor colorFuselage(json.value(prefix % u"colorfuselage").toString()); + const CRgbColor colorTail(json.value(prefix % u"colortail").toString()); + const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % u"military").toString()); CAirlineIcaoCode airline; if (!isColorLivery) { airline = CAirlineIcaoCode::fromDatabaseJson(json, "al_"); } CLivery livery(combinedCode, airline, description, colorFuselage, colorTail, military); @@ -271,7 +271,7 @@ namespace BlackMisc return CLivery(); } - const QString combinedCode(json.value(prefix % QStringLiteral("combinedcode")).toString()); + const QString combinedCode(json.value(prefix % u"combinedcode").toString()); if (combinedCode.isEmpty()) { CLivery liveryStub; // only consists of id, maybe key and timestamp @@ -280,16 +280,16 @@ namespace BlackMisc } const bool isColorLivery = combinedCode.startsWith(colorLiveryMarker()); - const QString description(json.value(prefix % QStringLiteral("description")).toString()); - const CRgbColor colorFuselage(json.value(prefix % QStringLiteral("colorfuselage")).toString()); - const CRgbColor colorTail(json.value(prefix % QStringLiteral("colortail")).toString()); - const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("military")).toString()); + const QString description(json.value(prefix % u"description").toString()); + const CRgbColor colorFuselage(json.value(prefix % u"colorfuselage").toString()); + const CRgbColor colorTail(json.value(prefix % u"colortail").toString()); + const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % u"military").toString()); CAirlineIcaoCode airline; if (!isColorLivery) { static const QString prefixAirline("al_"); - const int idAirlineIcao = json.value(prefixAirline % "id").toInt(-1); + const int idAirlineIcao = json.value(prefixAirline % u"id").toInt(-1); const bool cachedAirlineIcao = idAirlineIcao >= 0 && airlineIcaos.contains(idAirlineIcao); airline = cachedAirlineIcao ? diff --git a/src/blackmisc/country.cpp b/src/blackmisc/country.cpp index 019e32bbd..324c4c454 100644 --- a/src/blackmisc/country.cpp +++ b/src/blackmisc/country.cpp @@ -29,7 +29,7 @@ namespace BlackMisc if (m_dbKey.length() == 2) { // relative to images - return CIcon(QStringLiteral("flags/") % m_dbKey.toLower() % QStringLiteral(".png"), this->convertToQString()); + return CIcon(u"flags/" % m_dbKey.toLower() % u".png", this->convertToQString()); } else { @@ -74,13 +74,13 @@ namespace BlackMisc if (!this->hasIsoCode()) { return QString(); } QString s(m_dbKey); if (m_name.isEmpty()) { return s; } - return QStringLiteral(" (") % m_name % QStringLiteral(")"); + return u" (" % m_name % u')'; } QString CCountry::getCombinedStringNameIso() const { if (!this->isValid()) { return QString(); } - return m_name % QStringLiteral(" - ") % m_dbKey; + return m_name % u" - " % m_dbKey; } void CCountry::setName(const QString &countryName) @@ -185,12 +185,12 @@ namespace BlackMisc // when using relationship, this can be null return CCountry(); } - const QString iso(json.value(prefix % QStringLiteral("id")).toString()); - const QString name(json.value(prefix % QStringLiteral("country")).toString()); - const QString alias1(json.value(prefix % QStringLiteral("alias1")).toString()); - const QString alias2(json.value(prefix % QStringLiteral("alias2")).toString()); - const QString iso3(json.value(prefix % QStringLiteral("iso3")).toString()); - const QString historic(json.value(prefix % QStringLiteral("historic")).toString()); + const QString iso(json.value(prefix % u"id").toString()); + const QString name(json.value(prefix % u"country").toString()); + const QString alias1(json.value(prefix % u"alias1").toString()); + const QString alias2(json.value(prefix % u"alias2").toString()); + const QString iso3(json.value(prefix % u"iso3").toString()); + const QString historic(json.value(prefix % u"historic").toString()); CCountry country(iso, name); country.setLoadedFromDb(true); country.setAlias1(alias1); diff --git a/src/blackmisc/crashinfo.cpp b/src/blackmisc/crashinfo.cpp index 39056efc0..950d1795e 100644 --- a/src/blackmisc/crashinfo.cpp +++ b/src/blackmisc/crashinfo.cpp @@ -24,7 +24,7 @@ namespace BlackMisc { if (extraInfo.isEmpty()) { return; } if (m_info.isEmpty()) { this->setInfo(extraInfo); return; } - m_info += QStringLiteral(" ") % extraInfo; + m_info += u' ' % extraInfo; } CVariant CCrashInfo::propertyByIndex(const CPropertyIndex &index) const diff --git a/src/blackmisc/db/artifact.cpp b/src/blackmisc/db/artifact.cpp index f6885382f..1712e865c 100644 --- a/src/blackmisc/db/artifact.cpp +++ b/src/blackmisc/db/artifact.cpp @@ -105,16 +105,16 @@ namespace BlackMisc QString CArtifact::convertToQString(const QString &separator, bool i18n) const { Q_UNUSED(i18n); - return QLatin1String("name: ") % + return u"name: " % this->getName() % separator % - QLatin1String("size: ") % + u"size: " % this->getFileSizeHumanReadable() % separator % - QLatin1String("OS: ") % + u"OS: " % this->getPlatform().toQString(i18n) % separator % - QLatin1String("timestamp: ") % + u"timestamp: " % this->getFormattedUtcTimestampYmdhms(); } diff --git a/src/blackmisc/db/datastore.cpp b/src/blackmisc/db/datastore.cpp index 9ea414c86..473713591 100644 --- a/src/blackmisc/db/datastore.cpp +++ b/src/blackmisc/db/datastore.cpp @@ -29,7 +29,7 @@ namespace BlackMisc QString IDatastoreObjectWithIntegerKey::getDbKeyAsStringInParentheses(const QString &prefix) const { if (m_dbKey < 0) { return {}; } - return prefix % QStringLiteral("(") % QString::number(m_dbKey) % QStringLiteral(")"); + return prefix % u'(' % QString::number(m_dbKey) % u')'; } void IDatastoreObjectWithIntegerKey::setDbKey(const QString &key) @@ -76,19 +76,19 @@ namespace BlackMisc void IDatastoreObjectWithIntegerKey::setKeyAndTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix) { // this function is performance sensitive, as it is called for all DB data - const int dbKey = json.value(prefix % QStringLiteral("id")).toInt(-1); + const int dbKey = json.value(prefix % u"id").toInt(-1); this->setDbKey(dbKey); // we check 2 formats, the DB format and the backend object format - QString timestampString(json.value(prefix % QStringLiteral("lastupdated")).toString()); - if (timestampString.isEmpty()) { timestampString = json.value(prefix % QStringLiteral("tsLastUpdated")).toString(); } + QString timestampString(json.value(prefix % u"lastupdated").toString()); + if (timestampString.isEmpty()) { timestampString = json.value(prefix % u"tsLastUpdated").toString(); } const QDateTime ts(CDatastoreUtility::parseTimestamp(timestampString)); this->setUtcTimestamp(ts); } bool IDatastoreObjectWithIntegerKey::existsKey(const QJsonObject &json, const QString &prefix) { - const QJsonValue jv(json.value(prefix % QStringLiteral("id"))); + const QJsonValue jv(json.value(prefix % u"id")); return !(jv.isNull() || jv.isUndefined()); } @@ -151,7 +151,7 @@ namespace BlackMisc QString IDatastoreObjectWithStringKey::getDbKeyAsStringInParentheses(const QString &prefix) const { if (m_dbKey.isEmpty()) { return ""; } - return prefix % QStringLiteral("(") % m_dbKey % QStringLiteral(")"); + return prefix % '(' % m_dbKey % ')'; } bool IDatastoreObjectWithStringKey::matchesDbKeyState(Db::DbKeyStateFilter filter) const @@ -169,15 +169,15 @@ namespace BlackMisc void IDatastoreObjectWithStringKey::setKeyAndTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix) { - QString dbKey = json.value(prefix % QStringLiteral("id")).toString(); - QDateTime ts(CDatastoreUtility::parseTimestamp(json.value(prefix + "lastupdated").toString())); + QString dbKey = json.value(prefix % u"id").toString(); + QDateTime ts(CDatastoreUtility::parseTimestamp(json.value(prefix % u"lastupdated").toString())); this->setDbKey(dbKey); this->setUtcTimestamp(ts); } bool IDatastoreObjectWithStringKey::existsKey(const QJsonObject &json, const QString &prefix) { - const QJsonValue jv(json.value(prefix % QStringLiteral("id"))); + const QJsonValue jv(json.value(prefix % u"id")); return !(jv.isNull() || jv.isUndefined()); } diff --git a/src/blackmisc/db/distribution.cpp b/src/blackmisc/db/distribution.cpp index 1bed8f214..aa11a8715 100644 --- a/src/blackmisc/db/distribution.cpp +++ b/src/blackmisc/db/distribution.cpp @@ -64,13 +64,13 @@ namespace BlackMisc QString CDistribution::convertToQString(const QString &separator, bool i18n) const { - return QLatin1String("channel: ") % + return u"channel: " % this->getChannel() % separator % - QLatin1String("download URLs: ") % + u"download URLs: " % getDownloadUrls().toQString(i18n) % separator % - QLatin1String("timestamp: ") % + u"timestamp: " % this->getFormattedUtcTimestampYmdhms(); } diff --git a/src/blackmisc/db/updateinfo.cpp b/src/blackmisc/db/updateinfo.cpp index 6242016af..b2ff5e0f5 100644 --- a/src/blackmisc/db/updateinfo.cpp +++ b/src/blackmisc/db/updateinfo.cpp @@ -96,13 +96,13 @@ namespace BlackMisc QString CUpdateInfo::convertToQString(const QString &separator, bool i18n) const { Q_UNUSED(i18n); - return QLatin1String("artifacts (PC): ") % + return u"artifacts (PC): " % this->getArtifactsPilotClient().toQString(i18n) % separator % - QLatin1String("artifacts (XSB): ") % + u"artifacts (XSB): " % this->getArtifactsXSwiftBus().toQString(i18n) % separator % - QLatin1String("distributions: ") % + u"distributions: " % this->getDistributions().toQString(i18n); } diff --git a/src/blackmisc/dbusutils.cpp b/src/blackmisc/dbusutils.cpp index 7d3c1beaf..2aa37614a 100644 --- a/src/blackmisc/dbusutils.cpp +++ b/src/blackmisc/dbusutils.cpp @@ -37,12 +37,12 @@ namespace BlackMisc qv = arg.asVariant(); // this advances in the stream if (qv.canConvert()) { - out += indent % type % QLatin1String("signature ") % signature % QLatin1Char('\n'); - out += CDBusUtils::getQDBusArgumentSignature(qv.value(), level + 1) % QLatin1Char('\n'); + out += indent % type % u"signature " % signature % u'\n'; + out += CDBusUtils::getQDBusArgumentSignature(qv.value(), level + 1) % u'\n'; } else { - out += indent % QLatin1String("type: ") % type % QLatin1String("signature ") % signature % QLatin1String(" value ") % qv.toString() % QLatin1Char('\n'); + out += indent % u"type: " % type % u"signature " % signature % u" value " % qv.toString() % u'\n'; } } arg.endArray(); diff --git a/src/blackmisc/filelogger.cpp b/src/blackmisc/filelogger.cpp index 7b5859444..f63bc590a 100644 --- a/src/blackmisc/filelogger.cpp +++ b/src/blackmisc/filelogger.cpp @@ -75,12 +75,12 @@ namespace BlackMisc const QString categories = statusMessage.getCategoriesAsString(); if (categories != m_previousCategories) { - writeContentToFile(QStringLiteral("\n[") % categories % QStringLiteral("]")); + writeContentToFile(u"\n[" % categories % u']'); m_previousCategories = categories; } const QString finalContent(QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss ")) % statusMessage.getSeverityAsString() - % ": " + % u": " % statusMessage.getMessage()); writeContentToFile(finalContent); diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index 001039864..659ef0bcb 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -427,8 +427,8 @@ namespace BlackMisc QString ICoordinateWithRelativePosition::convertToQString(bool i18n) const { - return m_relativeBearing.toQString(i18n) % QLatin1Char(' ') % - m_relativeDistance.toQString(i18n) % QLatin1Char(' ') % + return m_relativeBearing.toQString(i18n) % u' ' % + m_relativeDistance.toQString(i18n) % u' ' % ICoordinateGeodetic::convertToQString(i18n); } diff --git a/src/blackmisc/htmlutils.cpp b/src/blackmisc/htmlutils.cpp index 4337a6f01..ea510004c 100644 --- a/src/blackmisc/htmlutils.cpp +++ b/src/blackmisc/htmlutils.cpp @@ -24,18 +24,18 @@ namespace BlackMisc for (int c = 0; c < columns; c++) { html += (i < size) ? - QStringLiteral("") % values.at(i) % QStringLiteral("") : + u"" % values.at(i) % u"" : QStringLiteral(""); i++; } html += QStringLiteral(""); } - return QStringLiteral("") % html % QStringLiteral("
"); + return u"" % html % u"
"; } QString unwrappedTooltip(const QString &text) { - return QStringLiteral("

") % text % QStringLiteral("

"); + return u"

" % text % u"

"; } } // ns diff --git a/src/blackmisc/htmlutils.h b/src/blackmisc/htmlutils.h index 90c2c7836..7e999fd48 100644 --- a/src/blackmisc/htmlutils.h +++ b/src/blackmisc/htmlutils.h @@ -29,11 +29,11 @@ namespace BlackMisc QString rowHtml; for (const CPropertyIndex &index : indexes) { - rowHtml += QStringLiteral("") % obj.propertyByIndex(index).toQString(true) % QStringLiteral(""); + rowHtml += u"" % obj.propertyByIndex(index).toQString(true) % u""; } - html += QStringLiteral("") % rowHtml % QStringLiteral(""); + html += u"" % rowHtml % u""; } - return QStringLiteral("") % html % QStringLiteral("
"); + return u"" % html % u"
"; } //! Values as HTML table diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp index ad7adb024..c59d74b12 100644 --- a/src/blackmisc/icon.cpp +++ b/src/blackmisc/icon.cpp @@ -86,7 +86,7 @@ namespace BlackMisc QString CIcon::convertToQString(bool i18n) const { Q_UNUSED(i18n); - const QString s = m_descriptiveText % QStringLiteral(" ") % QString::number(m_index); + const QString s = m_descriptiveText % u' ' % QString::number(m_index); return s; } diff --git a/src/blackmisc/identifier.cpp b/src/blackmisc/identifier.cpp index b15d591a1..200c96bc9 100644 --- a/src/blackmisc/identifier.cpp +++ b/src/blackmisc/identifier.cpp @@ -142,10 +142,10 @@ namespace BlackMisc { Q_UNUSED(i18n); const QString s = m_name % - QLatin1Char(' ') % m_machineIdBase64 % - QLatin1Char(' ') % m_machineName % - QLatin1Char(' ') % QString::number(m_processId) % - QLatin1Char(' ') % m_processName; + u' ' % m_machineIdBase64 % + u' ' % m_machineName % + u' ' % QString::number(m_processId) % + u' ' % m_processName; return s; } diff --git a/src/blackmisc/input/actionhotkey.cpp b/src/blackmisc/input/actionhotkey.cpp index 97ed900ef..2ea9065c1 100644 --- a/src/blackmisc/input/actionhotkey.cpp +++ b/src/blackmisc/input/actionhotkey.cpp @@ -26,9 +26,9 @@ namespace BlackMisc { const QString s = m_identifier.getMachineName() % - QStringLiteral(" ") % + u' ' % m_combination.toQString() % - QStringLiteral(" ") % + u' ' % m_action; return s; } diff --git a/src/blackmisc/jsonexception.cpp b/src/blackmisc/jsonexception.cpp index d9c900ab4..3f3649a8c 100644 --- a/src/blackmisc/jsonexception.cpp +++ b/src/blackmisc/jsonexception.cpp @@ -52,7 +52,7 @@ namespace BlackMisc for (const auto scope : BlackMisc::as_const(jsonStack())) { list.push_back(scope->m_string ? *scope->m_string : scope->m_latin1); // clazy:exclude=reserve-candidates - if (scope->m_index >= 0) { list.back() += "[" % QString::number(scope->m_index) % "]"; } + if (scope->m_index >= 0) { list.back() += u'[' % QString::number(scope->m_index) % u']'; } } return list.isEmpty() ? QStringLiteral("") : list.join('.'); } diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp index c404cdf30..71746a1cb 100644 --- a/src/blackmisc/network/authenticateduser.cpp +++ b/src/blackmisc/network/authenticateduser.cpp @@ -39,7 +39,7 @@ namespace BlackMisc { if (hasValidRealName()) { - return m_realname % QStringLiteral(" ") % getDbKeyAsStringInParentheses(); + return m_realname % u' ' % getDbKeyAsStringInParentheses(); } else { diff --git a/src/blackmisc/network/networkutils.cpp b/src/blackmisc/network/networkutils.cpp index 603aa4615..1a186614a 100644 --- a/src/blackmisc/network/networkutils.cpp +++ b/src/blackmisc/network/networkutils.cpp @@ -441,7 +441,7 @@ namespace BlackMisc report += (report.isEmpty() ? empty : separator) % - QString::number(++c) % QStringLiteral(": ") % + QString::number(++c) % u": " % CNetworkUtils::networkConfigurationToString(config); } @@ -461,7 +461,7 @@ namespace BlackMisc { report += (report.isEmpty() ? empty : separator) % - QStringLiteral("QAM: ") % + u"QAM: " % CNetworkUtils::createNetworkAccessManagerReport(qam); } diff --git a/src/blackmisc/network/role.cpp b/src/blackmisc/network/role.cpp index 0ea844f84..a26957609 100644 --- a/src/blackmisc/network/role.cpp +++ b/src/blackmisc/network/role.cpp @@ -23,8 +23,8 @@ namespace BlackMisc QString CRole::convertToQString(bool i18n) const { Q_UNUSED(i18n); - return "Role: " % m_name % - " description: " % m_description % + return u"Role: " % m_name % + u" description: " % m_description % this->getDbKeyAsStringInParentheses(" "); } diff --git a/src/blackmisc/network/textmessage.cpp b/src/blackmisc/network/textmessage.cpp index 2aeda4b52..a9bb3c835 100644 --- a/src/blackmisc/network/textmessage.cpp +++ b/src/blackmisc/network/textmessage.cpp @@ -41,10 +41,10 @@ namespace BlackMisc if (this->isPrivateMessage()) { return m_message % - QStringLiteral(" ") % m_senderCallsign.toQString(i18n) % - QStringLiteral(" ") % m_recipientCallsign.toQString(i18n); + u' ' % m_senderCallsign.toQString(i18n) % + u' ' % m_recipientCallsign.toQString(i18n); } - return m_message % QStringLiteral(" ") % m_frequency.toQString(i18n); + return m_message % u' ' % m_frequency.toQString(i18n); } bool CTextMessage::isPrivateMessage() const @@ -87,7 +87,7 @@ namespace BlackMisc { if (textMessage.isEmpty()) { return false; } if (!this->canBeAppended(textMessage)) { return false; } - m_message += QStringLiteral(" ") % textMessage.getMessage(); + m_message += u' ' % textMessage.getMessage(); return true; } diff --git a/src/blackmisc/network/user.cpp b/src/blackmisc/network/user.cpp index c70fd74cd..d2197cdcb 100644 --- a/src/blackmisc/network/user.cpp +++ b/src/blackmisc/network/user.cpp @@ -59,7 +59,7 @@ namespace BlackMisc { if (this->hasRealName()) { - if (this->hasId()) { return this->getRealName() % QStringLiteral(" (") % this->getId() % QStringLiteral(")"); } + if (this->hasId()) { return this->getRealName() % u" (" % this->getId() % QStringLiteral(")"); } return this->getRealName(); } return this->getId(); @@ -78,11 +78,11 @@ namespace BlackMisc QString s = m_realname; if (this->hasId()) { - s += QStringLiteral(" (") % m_id % QStringLiteral(")"); + s += u" (" % m_id % u')'; } if (this->hasCallsign()) { - s += QStringLiteral(" ") % this->getCallsign().getStringAsSet(); + s += u' ' % this->getCallsign().getStringAsSet(); } return s; } diff --git a/src/blackmisc/simulation/aircraftmatchersetup.cpp b/src/blackmisc/simulation/aircraftmatchersetup.cpp index a88cea64a..fc66256c6 100644 --- a/src/blackmisc/simulation/aircraftmatchersetup.cpp +++ b/src/blackmisc/simulation/aircraftmatchersetup.cpp @@ -48,10 +48,10 @@ namespace BlackMisc QString CAircraftMatcherSetup::convertToQString(bool i18n) const { Q_UNUSED(i18n); - return QStringLiteral("algorithm: '") % this->getMatchingAlgorithmAsString() % - QStringLiteral("' mode: '") % this->getMatchingModeAsString() % - QStringLiteral("' strategy: '") % this->getPickStrategyAsString() % - QStringLiteral("'"); + return u"algorithm: '" % this->getMatchingAlgorithmAsString() % + u"' mode: '" % this->getMatchingModeAsString() % + u"' strategy: '" % this->getPickStrategyAsString() % + u'\''; } CVariant CAircraftMatcherSetup::propertyByIndex(const CPropertyIndex &index) const diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index 6190fa90e..cb9953b6c 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -60,11 +60,11 @@ namespace BlackMisc { const QString s = (this->hasModelString() ? inApostrophes(m_modelString, true) % QStringLiteral(" ") : QString()) % - QStringLiteral(" type: '") % this->getModelTypeAsString() % - QStringLiteral("' ICAO: '") % this->getAircraftIcaoCode().toQString(i18n) % - QStringLiteral(" CG: ") % this->getCG().valueRoundedWithUnit(1) % - QStringLiteral("' {") % m_livery.toQString(i18n) % - QStringLiteral("} file: '") % m_fileName % QStringLiteral("'"); + u" type: '" % this->getModelTypeAsString() % + u"' ICAO: '" % this->getAircraftIcaoCode().toQString(i18n) % + u" CG: " % this->getCG().valueRoundedWithUnit(1) % + u"' {" % m_livery.toQString(i18n) % + u"} file: '" % m_fileName % u'\''; return s; } @@ -534,9 +534,9 @@ namespace BlackMisc QString CAircraftModel::getSwiftLiveryString() const { const QString l = - (this->getLivery().hasValidDbKey() ? QStringLiteral("l") % this->getLivery().getDbKeyAsString() : QString()) % + (this->getLivery().hasValidDbKey() ? u'l' % this->getLivery().getDbKeyAsString() : QString()) % (this->getAircraftIcaoCode().hasValidDbKey() ? QStringLiteral("a") % this->getAircraftIcaoCode().getDbKeyAsString() : QString()) % - (this->hasValidDbKey() ? QStringLiteral("m") % this->getDbKeyAsString() : QString()); + (this->hasValidDbKey() ? u'm' % this->getDbKeyAsString() : QString()); return l.isEmpty() ? QString() : liveryStringPrefix() % l; } @@ -851,10 +851,10 @@ namespace BlackMisc static const QString prefixLivery("liv_"); static const QString prefixDistributor("dist_"); - const QString modelString(json.value(prefix % QStringLiteral("modelstring")).toString()); - const QString modelDescription(json.value(prefix % QStringLiteral("description")).toString()); - const QString modelName(json.value(prefix % QStringLiteral("name")).toString()); - const QString modelMode(json.value(prefix % QStringLiteral("mode")).toString()); + const QString modelString(json.value(prefix % u"modelstring").toString()); + const QString modelDescription(json.value(prefix % u"description").toString()); + const QString modelName(json.value(prefix % u"name").toString()); + const QString modelMode(json.value(prefix % u"mode").toString()); const CSimulatorInfo simInfo = CSimulatorInfo::fromDatabaseJson(json, prefix); CDistributor distributor(CDistributor::fromDatabaseJson(json, prefixDistributor)); @@ -864,7 +864,7 @@ namespace BlackMisc //! \todo KB 2018-08 "idaircrafticao" seem not to be used anymore (remove???) in "vAircraftModelDenormalized", but was used in "vAircraftModelComplete" if (!aircraftIcao.isLoadedFromDb()) { - const int idAircraftIcao = json.value(prefix % QStringLiteral("idaircrafticao")).toInt(-1); + const int idAircraftIcao = json.value(prefix % u"idaircrafticao").toInt(-1); if (idAircraftIcao >= 0) { aircraftIcao.setDbKey(idAircraftIcao); @@ -873,7 +873,7 @@ namespace BlackMisc if (!livery.isLoadedFromDb()) { - const int idLivery = json.value(prefix % QStringLiteral("idlivery")).toInt(-1); + const int idLivery = json.value(prefix % u"idlivery").toInt(-1); if (idLivery >= 0) { livery.setDbKey(idLivery); @@ -882,7 +882,7 @@ namespace BlackMisc if (!distributor.isLoadedFromDb()) { - const QString idDistributor = json.value(prefix % QStringLiteral("iddistributor")).toString(); + const QString idDistributor = json.value(prefix % u"iddistributor").toString(); if (!idDistributor.isEmpty()) { distributor.setDbKey(idDistributor); @@ -907,15 +907,15 @@ namespace BlackMisc static const QString prefixLivery("liv_"); static const QString prefixDistributor("dist_"); - const QString modelString(json.value(prefix % QStringLiteral("modelstring")).toString()); - const QString modelDescription(json.value(prefix % QStringLiteral("description")).toString()); - const QString modelName(json.value(prefix % QStringLiteral("name")).toString()); - const QString modelMode(json.value(prefix % QStringLiteral("mode")).toString()); + const QString modelString(json.value(prefix % u"modelstring").toString()); + const QString modelDescription(json.value(prefix % u"description").toString()); + const QString modelName(json.value(prefix % u"name").toString()); + const QString modelMode(json.value(prefix % u"mode").toString()); const CSimulatorInfo simInfo = CSimulatorInfo::fromDatabaseJson(json, prefix); - const int idAircraftIcao = json.value(prefixAircraftIcao % QStringLiteral("id")).toInt(-1); - const int idLivery = json.value(prefixLivery % QStringLiteral("id")).toInt(-1); - const QString idDistributor = json.value(prefixDistributor % QStringLiteral("id")).toString(); + const int idAircraftIcao = json.value(prefixAircraftIcao % u"id").toInt(-1); + const int idLivery = json.value(prefixLivery % u"id").toInt(-1); + const QString idDistributor = json.value(prefixDistributor % u"id").toString(); const bool cachedAircraftIcao = (idAircraftIcao >= 0) && aircraftIcaos.contains(idAircraftIcao); const bool cachedLivery = (idLivery >= 0) && liveries.contains(idLivery); const bool cachedDistributor = !idDistributor.isEmpty() && distributors.contains(idDistributor); @@ -939,13 +939,13 @@ namespace BlackMisc if (!livery.isLoadedFromDb()) { - const int idLivery = json.value(prefix % QStringLiteral("idlivery")).toInt(-1); + const int idLivery = json.value(prefix % u"idlivery").toInt(-1); if (idLivery >= 0) { livery.setDbKey(idLivery); } } if (!distributor.isLoadedFromDb()) { - const QString idDistributor = json.value(prefix % QStringLiteral("iddistributor")).toString(); + const QString idDistributor = json.value(prefix % u"iddistributor").toString(); if (!idDistributor.isEmpty()) { distributor.setDbKey(idDistributor); } } diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 0c8df92a7..5c92c8ac3 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -1183,7 +1183,7 @@ namespace BlackMisc { html += html.isEmpty() ? model.asHtmlSummary(" ") : - QStringLiteral("
") % model.asHtmlSummary(" "); + u"
" % model.asHtmlSummary(" "); } return html; } @@ -1195,17 +1195,17 @@ namespace BlackMisc const int dbEntries = this->countWithValidDbKey(); const double dbRatio = CMathUtils::round(static_cast(100 * dbEntries) / this->size(), 1); return - QStringLiteral("Entries: ") % QString::number(this->size()) % - QStringLiteral(" | valid DB keys: ") % QString::number(dbEntries) % - QStringLiteral(" (") % QString::number(dbRatio) % QStringLiteral("%)") % separator % - QStringLiteral("color liveries: ") % QString::number(this->countModelsWithColorLivery()) % - QStringLiteral(" | airline liveries: ") % QString::number(this->countModelsWithAirlineLivery()) % separator % - QStringLiteral("VTOL: ") % QString::number(this->countVtolAircraft()) % - QStringLiteral(" | military: ") % QString::number(this->countMilitaryAircraft()) % - QStringLiteral(" | civilian: ") % QString::number(this->countCivilianAircraft()) % separator % - QStringLiteral("Different airlines: ") % QString::number(this->countDifferentAirlines()) % separator % - QStringLiteral("Combined types: '") % this->getCombinedTypesAsString() % QStringLiteral("'") % separator % - QStringLiteral("Simulators: ") % this->countPerSimulator().toQString(); + u"Entries: " % QString::number(this->size()) % + u" | valid DB keys: " % QString::number(dbEntries) % + u" (" % QString::number(dbRatio) % u"%)" % separator % + u"color liveries: " % QString::number(this->countModelsWithColorLivery()) % + u" | airline liveries: " % QString::number(this->countModelsWithAirlineLivery()) % separator % + u"VTOL: " % QString::number(this->countVtolAircraft()) % + u" | military: " % QString::number(this->countMilitaryAircraft()) % + u" | civilian: " % QString::number(this->countCivilianAircraft()) % separator % + u"Different airlines: " % QString::number(this->countDifferentAirlines()) % separator % + u"Combined types: '" % this->getCombinedTypesAsString() % u'\'' % separator % + u"Simulators: " % this->countPerSimulator().toQString(); } QString CAircraftModelList::coverageSummaryForModel(const CAircraftModel &checkModel, const QString &separator) const @@ -1213,10 +1213,10 @@ namespace BlackMisc const bool combinedCodeForModel = this->containsCombinedType(checkModel.getAircraftIcaoCode().getCombinedType()); const bool airlineForModel = checkModel.hasAirlineDesignator() && this->containsAirlineLivery(checkModel.getAirlineIcaoCode()); return coverageSummary(separator) % separator % - QStringLiteral("Data for input model, has combined: ") % boolToYesNo(combinedCodeForModel) % + u"Data for input model, has combined: " % boolToYesNo(combinedCodeForModel) % ( checkModel.hasAirlineDesignator() ? - QStringLiteral(" airline '") % checkModel.getAirlineIcaoCodeDesignator() % QStringLiteral("': ") % boolToYesNo(airlineForModel) : + u" airline '" % checkModel.getAirlineIcaoCodeDesignator() % u"': " % boolToYesNo(airlineForModel) : QString() ); } @@ -1232,7 +1232,7 @@ namespace BlackMisc QStringList designators(icaos.allDesignators().toList()); designators.sort(); stats += sep % sep % - QStringLiteral("Aircraft ICAOs from DB: ") % sep % + u"Aircraft ICAOs from DB: " % sep % designators.join(", "); } @@ -1241,7 +1241,7 @@ namespace BlackMisc const CAirlineIcaoCodeList icaos = this->getAirlineIcaoCodesFromDb(); const QStringList designators = icaos.toIcaoDesignatorCompleterStrings(); stats += sep % sep % - QStringLiteral("Airline ICAOs from DB: ") % sep % + u"Airline ICAOs from DB: " % sep % designators.join(", "); } @@ -1250,7 +1250,7 @@ namespace BlackMisc const CAircraftModelList dbModels = this->findObjectsWithDbKey(); stats += sep % sep % - QStringLiteral("DB objects:
---------") % + u"DB objects:
---------" % sep % dbModels.htmlStatistics(false, false); } diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp index fb7175087..7116c89da 100644 --- a/src/blackmisc/simulation/distributor.cpp +++ b/src/blackmisc/simulation/distributor.cpp @@ -175,8 +175,8 @@ namespace BlackMisc } const CSimulatorInfo simulator = CSimulatorInfo::fromDatabaseJson(json, prefix); - const QString alias1(json.value(prefix % QStringLiteral("alias1")).toString()); - const QString alias2(json.value(prefix % QStringLiteral("alias2")).toString()); + const QString alias1(json.value(prefix % u"alias1").toString()); + const QString alias2(json.value(prefix % u"alias2").toString()); Q_ASSERT_X(!description.isEmpty(), Q_FUNC_INFO, "Missing description"); CDistributor distributor("", description, alias1, alias2, simulator); distributor.setKeyAndTimestampFromDatabaseJson(json, prefix); diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp index 88726bd4e..3486f6d58 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp +++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp @@ -338,7 +338,7 @@ namespace BlackMisc const QDir dir(simObjectsDirectoryFix); if (!dir.exists()) { return false; } - const QString lastSegment = QStringLiteral("/") % CFileUtils::lastPathSegment(simObjectsDirectoryFix) % QStringLiteral("/"); + const QString lastSegment = u'/' % CFileUtils::lastPathSegment(simObjectsDirectoryFix) % u'/'; const int index = model.getFileName().lastIndexOf(lastSegment); if (index < 0) { return false; } const QString relPart = model.getFileName().mid(index + lastSegment.length()); diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.cpp b/src/blackmisc/simulation/fsx/simconnectutilities.cpp index 8f0a53f8d..fd210290a 100644 --- a/src/blackmisc/simulation/fsx/simconnectutilities.cpp +++ b/src/blackmisc/simulation/fsx/simconnectutilities.cpp @@ -285,19 +285,19 @@ namespace BlackMisc } // XX = Gust speed const int gustSpeed = windLayer.getGustSpeed().valueInteger(CSpeedUnit::kts()); - if (gustSpeed > 0) { simconnectWinds += QStringLiteral("G") % arg1s.arg(gustSpeed, 2, 10, QLatin1Char('0')); } + if (gustSpeed > 0) { simconnectWinds += u'G' % arg1s.arg(gustSpeed, 2, 10, QLatin1Char('0')); } // UUU = Speed units - simconnectWinds += QLatin1String("KT"); + simconnectWinds += QStringLiteral("KT"); if (surface) { // Surface extension: // &DNNNNTS static const QString surfaceWinds = - QLatin1String("&D") % // D = specifier for surface layer - QLatin1String("305") % // Surface default depth is 1000 feet or 305m - QLatin1String("NG"); // We don't have turbulence or wind shear information, hence we use the defaults + "&D" // D = specifier for surface layer + "305" // Surface default depth is 1000 feet or 305m + "NG"; // We don't have turbulence or wind shear information, hence we use the defaults simconnectWinds += surfaceWinds; surface = false; } @@ -310,9 +310,9 @@ namespace BlackMisc // Winds aloft extension: // &ANNNNTS simconnectWinds += - QLatin1String("&A") % // A = specifier for altitude above mean sea-level (MSL) + u"&A" % // A = specifier for altitude above mean sea-level (MSL) arg1s.arg(altitudeValue, 4, 10, QLatin1Char('0')) % // NNNN = depth (height) in meters. - QLatin1String("NG"); // We don't have turbulence or wind shear information, hence we use the defaults + u"NG"; // We don't have turbulence or wind shear information, hence we use the defaults } } return simconnectWinds; @@ -375,7 +375,7 @@ namespace BlackMisc // Ignore clouds higher than 99900 feet if (level > 999) { continue; } simconnectClouds += arg1s.arg(level, 3, 10, QLatin1Char('0')) % - QLatin1Char('&'); + u'&'; // TT = Cloud type switch (cloudLayer.getClouds()) @@ -447,9 +447,9 @@ namespace BlackMisc const int altitude = temperatureLayer.getLevel().valueInteger(CLengthUnit::m()); simconnectTemperatures += arg1s.arg(temperature, 2, 10, QLatin1Char('0')) % // TT = temperature in Celsius - QLatin1String("/") % + u'/' % arg1s.arg(dewPoint, 2, 10, QLatin1Char('0')) % // DD = dewpoint in Celsius - QLatin1String("&A") % + u"&A" % arg1s.arg(altitude, 5, 10, QLatin1Char('0')); // NNNNN = altitude of the temperatures in meters. } return simconnectTemperatures; diff --git a/src/blackmisc/simulation/settings/simulatorsettings.cpp b/src/blackmisc/simulation/settings/simulatorsettings.cpp index 70c126d19..ed9c12346 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.cpp +++ b/src/blackmisc/simulation/settings/simulatorsettings.cpp @@ -98,10 +98,10 @@ namespace BlackMisc QString CSimulatorSettings::convertToQString(const QString &separator, bool i18n) const { Q_UNUSED(i18n); - return QStringLiteral("model directories: ") % + return u"model directories: " % m_modelDirectories.join(',') % separator % - QStringLiteral("exclude directories: ") % + u"exclude directories: " % m_excludeDirectoryPatterns.join(','); } diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp index bce9a9880..2660557ed 100644 --- a/src/blackmisc/simulation/simulatedaircraft.cpp +++ b/src/blackmisc/simulation/simulatedaircraft.cpp @@ -150,7 +150,7 @@ namespace BlackMisc QString CSimulatedAircraft::getAirlineAndAircraftIcaoCodeDesignators() const { - if (this->hasAircraftAndAirlineDesignator()) { return this->getAircraftIcaoCodeDesignator() % QStringLiteral("/") % this->getAirlineIcaoCodeDesignator(); } + if (this->hasAircraftAndAirlineDesignator()) { return this->getAircraftIcaoCodeDesignator() % u'/' % this->getAirlineIcaoCodeDesignator(); } if (this->hasAirlineDesignator()) { return this->getAirlineIcaoCodeDesignator(); } return this->getAircraftIcaoCodeDesignator(); } @@ -464,8 +464,8 @@ namespace BlackMisc const CAircraftIcaoCode icaoNw(this->getNetworkModel().getAircraftIcaoCode()); if (!icao.hasDesignator()) { return QStringLiteral("[x] no sim."); } if (!icaoNw.hasDesignator()) { return QStringLiteral("[x] no nw."); } - if (icao.isDbEqual(icaoNw) || icao == icaoNw) { return QStringLiteral("[==] ") % icao.getDesignatorDbKey(); } - if (icao.getDesignator() == icaoNw.getDesignator()) { return QStringLiteral("[=] ") % icao.getDesignator(); } + 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()); } @@ -490,8 +490,8 @@ namespace BlackMisc const CAirlineIcaoCode icao(this->getModel().getAirlineIcaoCode()); const CAirlineIcaoCode icaoNw(this->getNetworkModel().getAirlineIcaoCode()); - if (icao.isDbEqual(icaoNw) || icao == icaoNw) { return QStringLiteral("[==] ") % icao.getDesignatorDbKey(); } - if (icao.getDesignator() == icaoNw.getDesignator()) { return QStringLiteral("[=] ") % icao.getDesignatorDbKey(); } + if (icao.isDbEqual(icaoNw) || icao == icaoNw) { return u"[==] " % icao.getDesignatorDbKey(); } + if (icao.getDesignator() == icaoNw.getDesignator()) { return u"[=] " % icao.getDesignatorDbKey(); } return diff.arg(icaoNw.getDesignator(), icao.getDesignator()); } @@ -575,14 +575,14 @@ namespace BlackMisc QString CSimulatedAircraft::convertToQString(bool i18n) const { const QString s = m_callsign.toQString(i18n) % - QLatin1Char(' ') % m_pilot.toQString(i18n) % - QLatin1Char(' ') % m_situation.toQString(i18n) % - QLatin1Char(' ') % m_com1system.toQString(i18n) % - QLatin1Char(' ') % m_com2system.toQString(i18n) % - QLatin1Char(' ') % m_transponder.toQString(i18n) % - QLatin1String(" enabled: ") % BlackMisc::boolToYesNo(this->isEnabled()) % - QLatin1String(" rendered: ") % BlackMisc::boolToYesNo(this->isRendered()) % - QLatin1Char(' ') % this->getModel().toQString(i18n); + u' ' % m_pilot.toQString(i18n) % + u' ' % m_situation.toQString(i18n) % + u' ' % m_com1system.toQString(i18n) % + u' ' % m_com2system.toQString(i18n) % + u' ' % m_transponder.toQString(i18n) % + u" enabled: " % BlackMisc::boolToYesNo(this->isEnabled()) % + u" rendered: " % BlackMisc::boolToYesNo(this->isRendered()) % + u' '% this->getModel().toQString(i18n); return s; } } // namespace diff --git a/src/blackmisc/simulation/simulationenvironmentprovider.cpp b/src/blackmisc/simulation/simulationenvironmentprovider.cpp index 965b16148..f0521159a 100644 --- a/src/blackmisc/simulation/simulationenvironmentprovider.cpp +++ b/src/blackmisc/simulation/simulationenvironmentprovider.cpp @@ -221,7 +221,7 @@ namespace BlackMisc v = m_simulatorVersion; } - if (!n.isEmpty() && !v.isEmpty()) { return n % QStringLiteral(" ") % v; } + if (!n.isEmpty() && !v.isEmpty()) { return n % u' ' % v; } if (!n.isEmpty()) { return n; } const CSimulatorInfo simInfo = this->getSimulatorInfo(); diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp index ccb876cf1..20d162e33 100644 --- a/src/blackmisc/simulation/simulatorinfo.cpp +++ b/src/blackmisc/simulation/simulatorinfo.cpp @@ -333,11 +333,11 @@ namespace BlackMisc CSimulatorInfo CSimulatorInfo::fromDatabaseJson(const QJsonObject &json, const QString &prefix) { - const QJsonValue jfsx = json.value(prefix % QStringLiteral("simfsx")); - const QJsonValue jfs9 = json.value(prefix % QStringLiteral("simfs9")); - const QJsonValue jxp = json.value(prefix % QStringLiteral("simxplane")); - const QJsonValue jp3d = json.value(prefix % QStringLiteral("simp3d")); - const QJsonValue jfg = json.value(prefix % QStringLiteral("simfg")); + const QJsonValue jfsx = json.value(prefix % u"simfsx"); + const QJsonValue jfs9 = json.value(prefix % u"simfs9"); + const QJsonValue jxp = json.value(prefix % u"simxplane"); + const QJsonValue jp3d = json.value(prefix % u"simp3d"); + const QJsonValue jfg = json.value(prefix % u"simfg"); // we handle bool JSON values and bool as string const bool fsx = jfsx.isBool() ? jfsx.toBool() : CDatastoreUtility::dbBoolStringToBool(jfsx.toString()); @@ -401,11 +401,11 @@ namespace BlackMisc QString CCountPerSimulator::toQString() const { - return QStringLiteral("FSX: ") % QString::number(m_counts[0]) % - QStringLiteral(" P3D: ") % QString::number(m_counts[1]) % - QStringLiteral(" FS9: ") % QString::number(m_counts[2]) % - QStringLiteral(" XPlane: ") % QString::number(m_counts[3]) % - QStringLiteral(" FG: ") % QString::number(m_counts[4]); + return u"FSX: " % QString::number(m_counts[0]) % + u" P3D: " % QString::number(m_counts[1]) % + u" FS9: " % QString::number(m_counts[2]) % + u" XPlane: " % QString::number(m_counts[3]) % + u" FG: " % QString::number(m_counts[4]); } void CCountPerSimulator::setCount(int count, const CSimulatorInfo &simulator) diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp index 5eddd5141..3cf82629c 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -70,22 +70,22 @@ namespace BlackMisc { if (model.getDistributor().hasDescription() && !model.getName().contains(model.getDistributor().getDescription())) { - return QStringLiteral("[ACF] ") % model.getName() % QStringLiteral(" by ") % model.getDistributor().getDescription(); + return u"[ACF] " % model.getName() % u" by " % model.getDistributor().getDescription(); } else { - return QStringLiteral("[ACF] ") % model.getName(); + return u"[ACF] " % model.getName(); } } else if (model.hasAircraftDesignator()) { if (model.getDistributor().hasDescription()) { - return QStringLiteral("[ACF] ") % model.getAircraftIcaoCodeDesignator() % QStringLiteral(" by ") % model.getDistributor().getDescription(); + return u"[ACF] " % model.getAircraftIcaoCodeDesignator() % u" by " % model.getDistributor().getDescription(); } else { - return QStringLiteral("[ACF] ") % model.getAircraftIcaoCodeDesignator(); + return u"[ACF] " % model.getAircraftIcaoCodeDesignator(); } } return QStringLiteral("[ACF]"); @@ -156,8 +156,8 @@ namespace BlackMisc { QString modelName = dirNames.join(' ') % - QLatin1Char(' ') % objectName % - QLatin1Char(' ') % textureName; + u' ' % objectName % + u' ' % textureName; return std::move(modelName).trimmed(); } @@ -216,7 +216,7 @@ namespace BlackMisc while (liveryIt.hasNext()) { liveryIt.next(); - model.setModelString(baseModelString % ' ' % liveryIt.fileName()); + model.setModelString(baseModelString % u' ' % liveryIt.fileName()); addUniqueModel(model, installedModels); } } diff --git a/src/blackmisc/stacktrace.cpp b/src/blackmisc/stacktrace.cpp index 1cb88cddd..538f74ba3 100644 --- a/src/blackmisc/stacktrace.cpp +++ b/src/blackmisc/stacktrace.cpp @@ -86,7 +86,7 @@ namespace BlackMisc SymFromAddr(process, reinterpret_cast(stack[i]), nullptr, &symbol.info); SymGetLineFromAddr64(process, reinterpret_cast(stack[i]), &displacement, &line); - result.push_back(QLatin1String(symbol.info.Name) % " line " % QString::number(line.LineNumber)); + result.push_back(QLatin1String(symbol.info.Name) % u" line " % QString::number(line.LineNumber)); } return result; } @@ -120,12 +120,12 @@ namespace BlackMisc if (demangled) { - result.push_back(QLatin1String(demangled) % ' ' % - '(' % QLatin1String(basename, basenameEnd - basename) % ' ' % QLatin1String(symbol, end - symbol) % ')'); + result.push_back(QLatin1String(demangled) % u' ' % + u'(' % QLatin1String(basename, basenameEnd - basename) % u' ' % QLatin1String(symbol, end - symbol) % u')'); } else { - result.push_back('(' % QLatin1String(basename, basenameEnd - basename) % ' ' % QLatin1String(symbol, end - symbol) % ')'); + result.push_back(u'(' % QLatin1String(basename, basenameEnd - basename) % u' ' % QLatin1String(symbol, end - symbol) % u')'); demangled = temp; } } diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp index fec7ae15b..8b2d43e08 100644 --- a/src/blackmisc/statusmessage.cpp +++ b/src/blackmisc/statusmessage.cpp @@ -258,16 +258,16 @@ namespace BlackMisc QString CStatusMessage::convertToQString(bool /** i18n */) const { - return QLatin1String("Category: ") % + return u"Category: " % m_categories.toQString() % - QLatin1String(" Severity: ") % + u" Severity: " % severityToString(m_severity) % - QLatin1String(" when: ") % + u" when: " % this->getFormattedUtcTimestampYmdhms() % - QLatin1String(" ") % + u' ' % this->getMessage(); } @@ -369,8 +369,8 @@ namespace BlackMisc auto min = *minmax.first; auto max = *minmax.second; if (min == SeverityDebug && max == SeverityError) { static const QString all("all severities"); return all; } - if (min == SeverityDebug) { QStringLiteral("at or below ") % severityToString(max); } - if (max == SeverityError) { QStringLiteral("at or above ") % severityToString(min); } + if (min == SeverityDebug) { u"at or below " % severityToString(max); } + if (max == SeverityError) { u"at or above " % severityToString(min); } auto list = severities.toList(); std::sort(list.begin(), list.end()); QStringList ret; @@ -458,8 +458,8 @@ namespace BlackMisc { switch (this->getSeverity()) { - case SeverityWarning: return img % QStringLiteral("") % this->getMessage() % QStringLiteral(""); - case SeverityError: return img % QStringLiteral("") % this->getMessage() % QStringLiteral(""); + case SeverityWarning: return img % u"" % this->getMessage() % u""; + case SeverityError: return img % u"" % this->getMessage() % u""; case SeverityDebug: break; default: break; } diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp index 52f77db42..d580f2139 100644 --- a/src/blackmisc/statusmessagelist.cpp +++ b/src/blackmisc/statusmessagelist.cpp @@ -232,20 +232,20 @@ namespace BlackMisc QString rowHtml; if (withLineNumbers) { - rowHtml = QLatin1String("") % QString::number(line++) % QLatin1String(""); + rowHtml = u"" % QString::number(line++) % u""; } for (const CPropertyIndex &index : usedIndexes) { - rowHtml += QLatin1String("") % + rowHtml += u"" % statusMessage.propertyByIndex(index).toQString(true).toHtmlEscaped().replace('\n', "
") % - QLatin1String(""); + u""; } const QString severityClass = statusMessage.getSeverityAsString(); html += QStringLiteral("%2").arg(severityClass, rowHtml); } - return "" % html % "
"; + return u"" % html % u"
"; } const CPropertyIndexList &CStatusMessageList::simpleHtmlOutput() @@ -262,10 +262,10 @@ namespace BlackMisc const QString htmlStyleSheetImpl() { - const QString style = QLatin1Char('.') % CStatusMessage::severityToString(CStatusMessage::SeverityDebug) % QLatin1String(" { color: lightgreen; } ") % - QLatin1Char('.') % CStatusMessage::severityToString(CStatusMessage::SeverityInfo) % QLatin1String(" { color: lightgreen; } ") % - QLatin1Char('.') % CStatusMessage::severityToString(CStatusMessage::SeverityWarning) % QLatin1String(" { color: yellow; } ") % - QLatin1Char('.') % CStatusMessage::severityToString(CStatusMessage::SeverityError) % QLatin1String(" { color: red; }"); + const QString style = u'.' % CStatusMessage::severityToString(CStatusMessage::SeverityDebug) % u" { color: lightgreen; } " % + u'.' % CStatusMessage::severityToString(CStatusMessage::SeverityInfo) % u" { color: lightgreen; } " % + u'.' % CStatusMessage::severityToString(CStatusMessage::SeverityWarning) % u" { color: yellow; } " % + u'.' % CStatusMessage::severityToString(CStatusMessage::SeverityError) % u" { color: red; }"; return style; } diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp index b64684bc4..78097fb7a 100644 --- a/src/blackmisc/stringutils.cpp +++ b/src/blackmisc/stringutils.cpp @@ -357,24 +357,20 @@ namespace BlackMisc QString inApostrophes(const QString &in, bool ignoreEmpty) { - static const QString e; - static const QString ea("''"); - if (in.isEmpty()) { return ignoreEmpty ? e : ea; } - return QStringLiteral("'") % in % QStringLiteral("'"); + if (in.isEmpty()) { return ignoreEmpty ? QString() : QStringLiteral("''"); } + return u'\'' % in % u'\''; } QString inQuotes(const QString &in, bool ignoreEmpty) { - static const QString e; - static const QString ea("\"\""); - if (in.isEmpty()) { return ignoreEmpty ? e : ea; } - return QStringLiteral("\"") % in % QStringLiteral("\""); + if (in.isEmpty()) { return ignoreEmpty ? QString() : QStringLiteral("\"\""); } + return u'"' % in % u'"'; } QString withQuestionMark(const QString &question) { if (question.endsWith("?")) { return question; } - return question % QStringLiteral("?"); + return question % u'?'; } int nthIndexOf(const QString &string, QChar ch, int nth, Qt::CaseSensitivity cs) diff --git a/src/blackmisc/weather/metar.cpp b/src/blackmisc/weather/metar.cpp index aee00545d..380e70f57 100644 --- a/src/blackmisc/weather/metar.cpp +++ b/src/blackmisc/weather/metar.cpp @@ -119,28 +119,28 @@ namespace BlackMisc for (const auto &presentWeather : m_presentWeathers) { if (!presentWeathers.isEmpty()) presentWeathers += ","; - presentWeathers += QStringLiteral(" ") % presentWeather.toQString(); + presentWeathers += u' ' % presentWeather.toQString(); } QString clouds; for (const auto &layer : m_cloudLayers) { if (!clouds.isEmpty()) clouds += ","; - clouds += QStringLiteral(" ") % layer.toQString(); + clouds += u' ' % layer.toQString(); } 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()) % m_windLayer.toQString() - % QStringLiteral("\n") + % u'\n' % QString("Visibility: %1\n").arg(m_visibility.toQString()) - % QString("Weather: ") + % u"Weather: " % presentWeathers.simplified() - % QStringLiteral("\n") - % QStringLiteral("Clouds:") + % u'\n' + % u"Clouds:" % clouds - % QStringLiteral("\n") + % 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()); diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index ce6ccce96..7890baa9d 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -2397,7 +2397,7 @@ namespace BlackSimPlugin const HRESULT hr = SimConnect_GetLastSentPacketID(m_hSimConnect, &dwLastId); if (isFailure(hr)) { return; } if (m_sendIdTraces.size() > MaxSendIdTraces) { m_sendIdTraces.removeLast(); } - const TraceFsxSendId trace(dwLastId, simObject, details.isEmpty() ? functionName : details % QStringLiteral(", ") % functionName); + const TraceFsxSendId trace(dwLastId, simObject, details.isEmpty() ? functionName : details % u", " % functionName); m_sendIdTraces.push_front(trace); } @@ -2418,7 +2418,7 @@ namespace BlackSimPlugin if (isOk(hr)) { return hr; } if (!warningMsg.isEmpty()) { - CLogMessage(this).warning(warningMsg % QStringLiteral(" SimObject: ") % simObject.toQString()); + CLogMessage(this).warning(warningMsg % u" SimObject: " % simObject.toQString()); } this->triggerAutoTraceSendId(); return hr; diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index 3677bc8bd..35cec0086 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -348,7 +348,7 @@ bool CSwiftLauncher::warnAboutOtherSwiftApplications() // getting here means another application is running const QString msg = - QStringLiteral("While using the wizard no other application should run.\nClose applications and try again.\nCurrently running: ") % + u"While using the wizard no other application should run.\nClose applications and try again.\nCurrently running: " % running.processNames().join(','); QMessageBox::question(this, "Wizard", msg, QMessageBox::Close); return false;