Ref T480 No need for QStringLiteral when concatenating with %, use UTF-16 string literals.

This commit is contained in:
Mat Sutcliffe
2018-12-20 19:26:39 +00:00
parent 5443701e09
commit ace7650ebe
67 changed files with 394 additions and 398 deletions

View File

@@ -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

View File

@@ -32,9 +32,9 @@ namespace BlackCore
{
return
CDbFlags::flagToString(this->getRetrievalMode()) %
QStringLiteral(" ") %
u' ' %
CEntityFlags::flagToString(this->getEntities()) %
QStringLiteral(" ") %
u' ' %
this->m_cacheLifetime.toQString(i18n);
}

View File

@@ -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;
}

View File

@@ -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";
}
}
}