flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-10 14:07:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackgui/components/altitudedialog.cpp
View File

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

2
src/blackgui/components/atcstationcomponent.cpp
View File

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

2
src/blackgui/components/copysettingsandcachescomponent.cpp
View File

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

4
src/blackgui/components/flightplancomponent.cpp
View File

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

4
src/blackgui/components/logincomponent.cpp
View File

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

2
src/blackgui/components/navigatordialog.cpp
View File

@@ -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());

6
src/blackgui/components/remoteaircraftselector.cpp
View File

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

4
src/blackgui/components/settingstextmessagestyle.cpp
View File

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

4
src/blackgui/components/textmessagecomponent.cpp
View File

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