diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index e8b62f8f0..ab048d5f2 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -258,13 +258,13 @@ namespace BlackCore const QString &CApplication::getApplicationNameAndVersion() const { - static const QString s(m_applicationName % QStringLiteral(" ") % CBuildConfig::getVersionString()); + static const QString s(m_applicationName % u" " % CBuildConfig::getVersionString()); return s; } const QString &CApplication::getApplicationNameVersionDetailed() const { - static const QString s(m_applicationName % QStringLiteral(" ") % this->versionStringDetailed()); + static const QString s(m_applicationName % u" " % this->versionStringDetailed()); return s; } @@ -487,17 +487,17 @@ namespace BlackCore { if (this->isDeveloperFlagSet() && CBuildConfig::isLocalDeveloperDebugBuild()) { - static const QString s(CBuildConfig::getVersionStringPlatform() + " [dev,DEVDBG]"); + static const QString s(CBuildConfig::getVersionStringPlatform() % u" [dev,DEVDBG]"); return s; } if (isDeveloperFlagSet()) { - static const QString s(CBuildConfig::getVersionStringPlatform() + " [dev]"); + static const QString s(CBuildConfig::getVersionStringPlatform() % u" [dev]"); return s; } if (CBuildConfig::isLocalDeveloperDebugBuild()) { - static const QString s(CBuildConfig::getVersionStringPlatform() + " [DEVDBG]"); + static const QString s(CBuildConfig::getVersionStringPlatform() % u" [DEVDBG]"); return s; } return CBuildConfig::getVersionStringPlatform(); @@ -591,41 +591,41 @@ namespace BlackCore { QString str = CBuildConfig::getVersionString() % - QStringLiteral(" ") % (CBuildConfig::isReleaseBuild() ? QStringLiteral("Release build") : QStringLiteral("Debug build")) % + u" " % (CBuildConfig::isReleaseBuild() ? u"Release build" : u"Debug build") % separator % - QStringLiteral("Local dev.dbg.: ") % + u"Local dev.dbg.: " % boolToYesNo(CBuildConfig::isLocalDeveloperDebugBuild()) % separator % - QStringLiteral("dev.env.: ") % + u"dev.env.: " % boolToYesNo(this->isDeveloperFlagSet()) % separator % - QStringLiteral("distribution: ") % + u"distribution: " % this->getOwnDistribution().toQString(true) % separator % - QStringLiteral("Windows NT: ") % + u"Windows NT: " % boolToYesNo(CBuildConfig::isRunningOnWindowsNtPlatform()) % - QStringLiteral(" Windows 10: ") % + u" Windows 10: " % boolToYesNo(CBuildConfig::isRunningOnWindows10()) % separator % - QStringLiteral("Linux: ") % + u"Linux: " % boolToYesNo(CBuildConfig::isRunningOnLinuxPlatform()) % - QStringLiteral(" Unix: ") % + " Unix: " % boolToYesNo(CBuildConfig::isRunningOnUnixPlatform()) % separator % - QStringLiteral("MacOS: ") % + u"MacOS: " % boolToYesNo(CBuildConfig::isRunningOnMacOSPlatform()) % separator % - QStringLiteral("Build Abi: ") % + "Build Abi: " % QSysInfo::buildAbi() % separator % - QStringLiteral("Build CPU: ") % + u"Build CPU: " % QSysInfo::buildCpuArchitecture() % separator % CBuildConfig::compiledWithInfo(false); if (this->supportsContexts()) { - str += (separator % QStringLiteral("Supporting contexts")); + str += (separator % u"Supporting contexts"); if (this->getIContextNetwork()) { str += (separator % this->getIContextNetwork()->getLibraryInfo(true)); @@ -1651,7 +1651,7 @@ namespace BlackCore qstringToFilePath(metrics), serverUrl.getFullUrl().toStdString(), annotations, - {}, + {}, false, true); return CStatusMessage(this).info(u"Using crash handler"); #else diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolationlogger.cpp index 98fede839..902f6448e 100644 --- a/src/blackmisc/simulation/interpolationlogger.cpp +++ b/src/blackmisc/simulation/interpolationlogger.cpp @@ -264,20 +264,21 @@ namespace BlackMisc { if (logs.isEmpty()) { return {}; } static const QString tableHeader = - QStringLiteral("") % - QStringLiteral("cs.Int") % - QStringLiteral("CSVTOLtimestampsince") % - QStringLiteral("ts oldts newts cur") % - QStringLiteral("Interpolation ts.Sample Δtfraction") % - QStringLiteral("lat.oldlat.newlat.cur") % - QStringLiteral("lng.oldlng.newlng.cur") % - QStringLiteral("alt.oldalt.newalt.cur") % - QStringLiteral("elv.oldelv.newelv.cur") % - QStringLiteral("gnd.factor") % - QStringLiteral("onGnd.oldonGnd.newonGnd.cur") % - QStringLiteral("CG") % - QStringLiteral("partscp.parts details") % - QStringLiteral("\n"); + QStringLiteral( + "" + "cs.Int" + u"CSVTOLtimestampsince" + u"ts oldts newts cur" + u"Interpolation ts.Sample Δtfraction" + u"lat.oldlat.newlat.cur" + u"lng.oldlng.newlng.cur" + u"alt.oldalt.newalt.cur" + u"elv.oldelv.newelv.cur" + u"gnd.factor" + u"onGnd.oldonGnd.newonGnd.cur" + u"CG" + u"partscp.parts details" + u"\n"); static const CLengthUnit ft = CLengthUnit::ft(); const SituationLog firstLog = logs.first(); @@ -294,68 +295,69 @@ namespace BlackMisc newPosTs = situationNew.getMSecsSinceEpoch(); lastParts = log.parts; + // fixme KB 2018/12 comment and tableRows can be removed if there are no further issues // concatenating in multiple steps, otherwise C4503 warnings tableRows += - QStringLiteral("") % + u"" % (changedNewPosition ? QStringLiteral("*") : QStringLiteral("")) % - QStringLiteral("") % log.interpolator % QStringLiteral("") % - QStringLiteral("") % log.callsign.asString() % QStringLiteral("") % - QStringLiteral("") % boolToYesNo(log.vtolAircraft) % QStringLiteral("") % - QStringLiteral("") % msSinceEpochToTime(log.tsCurrent) % QStringLiteral("") % - QStringLiteral("") % QString::number(log.tsCurrent - firstLog.tsCurrent) % QStringLiteral("") % + u"" % log.interpolator % u"" % + u"" % log.callsign.asString() % u"" % + u"" % boolToYesNo(log.vtolAircraft) % u"" % + u"" % msSinceEpochToTime(log.tsCurrent) % u"" % + u"" % QString::number(log.tsCurrent - firstLog.tsCurrent) % u"" % - QStringLiteral("") % situationOld.getTimestampAndOffset(true) % QStringLiteral("") % - QStringLiteral("") % situationNew.getTimestampAndOffset(true) % QStringLiteral("") % - QStringLiteral("") % log.situationCurrent.getTimestampAndOffset(true) % QStringLiteral("") % + u"" % situationOld.getTimestampAndOffset(true) % u"" % + u"" % situationNew.getTimestampAndOffset(true) % u"" % + u"" % log.situationCurrent.getTimestampAndOffset(true) % u"" % - QStringLiteral("") % msSinceEpochToTime(log.tsInterpolated) % QStringLiteral("") % - QStringLiteral("") % QString::number(log.deltaSampleTimesMs) % QStringLiteral("ms") % - QStringLiteral("") % QString::number(log.simTimeFraction) % QStringLiteral(""); + u"" % msSinceEpochToTime(log.tsInterpolated) % u"" % + u"" % QString::number(log.deltaSampleTimesMs) % u"ms" % + u"" % QString::number(log.simTimeFraction) % u"" % - tableRows += - QStringLiteral("") % situationOld.latitudeAsString() % QStringLiteral("") % - QStringLiteral("") % situationNew.latitudeAsString() % QStringLiteral("") % - QStringLiteral("") % log.situationCurrent.latitudeAsString() % QStringLiteral("") % + // tableRows += + u"" % situationOld.latitudeAsString() % u"" % + u"" % situationNew.latitudeAsString() % u"" % + u"" % log.situationCurrent.latitudeAsString() % u"" % - QStringLiteral("") % situationOld.longitudeAsString() % QStringLiteral("") % - QStringLiteral("") % situationNew.longitudeAsString() % QStringLiteral("") % - QStringLiteral("") % log.situationCurrent.longitudeAsString() % QStringLiteral(""); + u"" % situationOld.longitudeAsString() % u"" % + u"" % situationNew.longitudeAsString() % u"" % + u"" % log.situationCurrent.longitudeAsString() % u"" % - tableRows += - QStringLiteral("") % situationOld.getAltitude().valueRoundedWithUnit(ft, 1) % QStringLiteral("") % - QStringLiteral("") % situationNew.getAltitude().valueRoundedWithUnit(ft, 1) % QStringLiteral("") % - QStringLiteral("") % log.situationCurrent.getAltitude().valueRoundedWithUnit(ft, 1) % QStringLiteral("") % + // tableRows += + u"" % situationOld.getAltitude().valueRoundedWithUnit(ft, 1) % u"" % + u"" % situationNew.getAltitude().valueRoundedWithUnit(ft, 1) % u"" % + u"" % log.situationCurrent.getAltitude().valueRoundedWithUnit(ft, 1) % u"" % - QStringLiteral("") % situationOld.getGroundElevation().valueRoundedWithUnit(ft, 1) % QStringLiteral("") % - QStringLiteral("") % situationNew.getGroundElevation().valueRoundedWithUnit(ft, 1) % QStringLiteral("") % - QStringLiteral("") % log.situationCurrent.getGroundElevation().valueRoundedWithUnit(ft, 1) % QStringLiteral("") % + u"" % situationOld.getGroundElevation().valueRoundedWithUnit(ft, 1) % u"" % + u"" % situationNew.getGroundElevation().valueRoundedWithUnit(ft, 1) % u"" % + u"" % log.situationCurrent.getGroundElevation().valueRoundedWithUnit(ft, 1) % u"" % - QStringLiteral("") % QString::number(log.groundFactor) % QStringLiteral("") % - QStringLiteral("") % situationOld.getOnGroundInfo() % QStringLiteral("") % - QStringLiteral("") % situationNew.getOnGroundInfo() % QStringLiteral("") % - QStringLiteral("") % log.situationCurrent.getOnGroundInfo() % QStringLiteral(""); + u"" % QString::number(log.groundFactor) % u"" % + u"" % situationOld.getOnGroundInfo() % u"" % + u"" % situationNew.getOnGroundInfo() % u"" % + u"" % log.situationCurrent.getOnGroundInfo() % u"" % - tableRows += - QStringLiteral("") % log.cgAboveGround.valueRoundedWithUnit(ft, 0) % QStringLiteral("") % - QStringLiteral("") % boolToYesNo(log.useParts) % QStringLiteral("") % - (changedParts ? QStringLiteral("*") : QStringLiteral("")) % - QStringLiteral("") % (log.useParts ? log.parts.toQString(true) : QString()) % QStringLiteral("") % - QStringLiteral("\n"); + // tableRows += + u"" % log.cgAboveGround.valueRoundedWithUnit(ft, 0) % u"" % + u"" % boolToYesNo(log.useParts) % u"" % + (changedParts ? u"*" : u"") % + u"" % (log.useParts ? log.parts.toQString(true) : QString()) % u"" % + u"\n"; } tableRows += QStringLiteral("\n"); - return QStringLiteral("\n") % tableHeader % tableRows % QStringLiteral("
\n"); + return u"\n" % tableHeader % tableRows % u"
\n"; } QString CInterpolationLogger::getHtmlPartsLog(const QList &logs) { if (logs.isEmpty()) { return {}; } - static const QString tableHeader = - QStringLiteral("") % - QStringLiteral("CStimestamp") % - QStringLiteral("c.") % - QStringLiteral("parts") % - QStringLiteral("\n"); + static const QString tableHeader = QStringLiteral( + u"" + u"CStimestamp" + u"c." + u"parts" + u"\n"); CAircraftParts lastParts; // default, so shown if parts are different from default QString tableRows("\n"); @@ -364,13 +366,12 @@ namespace BlackMisc const bool changedParts = (lastParts != log.parts); lastParts = log.parts; tableRows += - QStringLiteral("") % - QStringLiteral("") % log.callsign.asString() % QStringLiteral("") % - QStringLiteral("") % msSinceEpochToTime(log.tsCurrent) % QStringLiteral("") % - (changedParts ? QStringLiteral("*") : QStringLiteral("")) % - QStringLiteral("") % (log.empty ? QStringLiteral("empty") : log.parts.toQString()) % QStringLiteral(""); + u"" % log.callsign.asString() % u"" % + u"" % msSinceEpochToTime(log.tsCurrent) % u"" % + (changedParts ? u"*" : u"") % + u"" % (log.empty ? QStringLiteral("empty") : log.parts.toQString()) % u""; } - tableRows += QStringLiteral("\n"); + tableRows += "\n"; return QStringLiteral("\n") % tableHeader % tableRows % QStringLiteral("
\n"); } @@ -388,7 +389,7 @@ namespace BlackMisc QString CInterpolationLogger::msSinceEpochToTimeAndTimestamp(qint64 ms) { - return CInterpolationLogger::msSinceEpochToTime(ms) % QStringLiteral("/") % QString::number(ms); + return CInterpolationLogger::msSinceEpochToTime(ms) % u"/" % QString::number(ms); } QString CInterpolationLogger::msSinceEpochToTime(qint64 t1, qint64 t2, qint64 t3) @@ -408,62 +409,62 @@ namespace BlackMisc return ( withSetup ? - QStringLiteral("setup: ") % usedSetup.toQString(true) % separator : + u"setup: " % usedSetup.toQString(true) % separator : QString() ) % ( withElevation ? - QStringLiteral("Elev.info: ") % elevationInfo % - QStringLiteral(" scenery os: ") % sceneryOffset.valueRoundedWithUnit(1) % separator : + u"Elev.info: " % elevationInfo % + u" scenery os: " % sceneryOffset.valueRoundedWithUnit(1) % separator : QString() ) % - QStringLiteral("change: ") % change.toQString(true) % + u"change: " % change.toQString(true) % separator % - QStringLiteral("Interpolation CS: ") % callsign.asString() % separator % - QStringLiteral("ts: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) % - QStringLiteral(" | type: ") % this->interpolationType() % - QStringLiteral(" | gnd.fa.: ") % QString::number(groundFactor) % - QStringLiteral(" | CG: ") % cgAboveGround.valueRoundedWithUnit(CLengthUnit::m(), 1) % - QStringLiteral(" ") % cgAboveGround.valueRoundedWithUnit(CLengthUnit::ft(), 1) % - QStringLiteral(" | alt.cor.: ") % altCorrection % - QStringLiteral(" | #nw.sit.: ") % QString::number(noNetworkSituations) % - QStringLiteral(" | #invalid: ") % QString::number(noInvalidSituations) % + u"Interpolation CS: " % callsign.asString() % separator % + u"ts: " % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) % + u" | type: " % this->interpolationType() % + u" | gnd.fa.: " % QString::number(groundFactor) % + u" | CG: " % cgAboveGround.valueRoundedWithUnit(CLengthUnit::m(), 1) % + u" " % cgAboveGround.valueRoundedWithUnit(CLengthUnit::ft(), 1) % + u" | alt.cor.: " % altCorrection % + u" | #nw.sit.: " % QString::number(noNetworkSituations) % + u" | #invalid: " % QString::number(noInvalidSituations) % ( withDeltaTimes ? separator % - QStringLiteral("cur.time: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) % - QStringLiteral(" | int.time: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsInterpolated) % - QStringLiteral(" | dt.cur.int.: ") % QString::number(deltaCurrentToInterpolatedTime()) % QStringLiteral("ms") % - QStringLiteral(" | sample dt: ") % QString::number(deltaSampleTimesMs) % QStringLiteral("ms") % - QStringLiteral(" | fr.[0-1]: ") % QString::number(simTimeFraction) % - QStringLiteral(" | old int.pos.: ") % situationOldInterpolation.getTimestampAndOffset(true) % - QStringLiteral(" | new int.pos.: ") % situationNewInterpolation.getTimestampAndOffset(true) % - QStringLiteral(" | #int.pos.: ") % QString::number(interpolationSituations.size()) : + u"cur.time: " % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) % + u" | int.time: " % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsInterpolated) % + u" | dt.cur.int.: " % QString::number(deltaCurrentToInterpolatedTime()) % u"ms" % + u" | sample dt: " % QString::number(deltaSampleTimesMs) % u"ms" % + u" | fr.[0-1]: " % QString::number(simTimeFraction) % + u" | old int.pos.: " % situationOldInterpolation.getTimestampAndOffset(true) % + u" | new int.pos.: " % situationNewInterpolation.getTimestampAndOffset(true) % + u" | #int.pos.: " % QString::number(interpolationSituations.size()) : QString() ) % ( withCurrentSituation ? separator % - QStringLiteral("cur.sit.(interpolated): ") % situationCurrent.toQString(true) : + u"cur.sit.(interpolated): " % situationCurrent.toQString(true) : QString() ) % ( withOtherPositions ? separator % - QStringLiteral("old: ") % situationOldInterpolation.toQString(true) % + u"old: " % situationOldInterpolation.toQString(true) % separator % - QStringLiteral("new: ") % situationNewInterpolation.toQString(true) : + u"new: " % situationNewInterpolation.toQString(true) : QString() ); } QString PartsLog::toQString(const QString &separator) const { - return QStringLiteral("CS: ") % callsign.asString() % separator % - QStringLiteral("ts: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) % - QStringLiteral(" | #nw.parts: ") % QString::number(noNetworkParts) % + return u"CS: " % callsign.asString() % separator % + u"ts: " % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) % + u" | #nw.parts: " % QString::number(noNetworkParts) % separator % - QStringLiteral("parts: ") % parts.toQString(true); + u"parts: " % parts.toQString(true); } const QString &SituationLog::interpolationType() const