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(" \n");
+ QStringLiteral(
+ "cs. Int ") %
- QStringLiteral("CS VTOL timestamp since ") %
- QStringLiteral("ts old ts new ts cur ") %
- QStringLiteral("Interpolation ts. Sample Δt fraction ") %
- QStringLiteral("lat.old lat.new lat.cur ") %
- QStringLiteral("lng.old lng.new lng.cur ") %
- QStringLiteral("alt.old alt.new alt.cur ") %
- QStringLiteral("elv.old elv.new elv.cur ") %
- QStringLiteral("gnd.factor ") %
- QStringLiteral("onGnd.old onGnd.new onGnd.cur ") %
- QStringLiteral("CG ") %
- QStringLiteral("parts cp. parts details ") %
- QStringLiteral(""
+ " \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("cs. Int "
+ u"CS VTOL timestamp since "
+ u"ts old ts new ts cur "
+ u"Interpolation ts. Sample Δt fraction "
+ u"lat.old lat.new lat.cur "
+ u"lng.old lng.new lng.cur "
+ u"alt.old alt.new alt.cur "
+ u"elv.old elv.new elv.cur "
+ u"gnd.factor "
+ u"onGnd.old onGnd.new onGnd.cur "
+ u"CG "
+ u"parts cp. parts details "
+ u"