From ecb9d868540be946e1e0d936ca32a5b700606ebf Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Mon, 11 Jul 2022 06:57:13 -0600
Subject: [PATCH] use QStringLiteral with constant QStrings and
QString::arg(*).
---
csv_util.cc | 2 +-
dg-100.cc | 2 +-
garmin_fit.cc | 4 ++--
garmin_gpi.cc | 6 +++---
garmin_tables.cc | 4 ++--
gdb.cc | 10 +++++-----
gpssim.cc | 2 +-
gtrnctr.cc | 2 +-
kml.cc | 14 +++++++-------
lowranceusr.cc | 2 +-
lowranceusr.h | 2 +-
mtk_logger.cc | 4 ++--
nmea.cc | 4 ++--
osm.cc | 2 +-
ozi.cc | 6 +++---
qstarz_bl_1000.cc | 2 +-
route.cc | 2 +-
skytraq.cc | 2 +-
tpo.cc | 10 +++++-----
trackfilter.cc | 6 +++---
transform.cc | 2 +-
unicsv.cc | 2 +-
waypt.cc | 4 ++--
23 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/csv_util.cc b/csv_util.cc
index 65448e24f..bff9907a8 100644
--- a/csv_util.cc
+++ b/csv_util.cc
@@ -55,7 +55,7 @@ csv_stringclean(const QString& source, const QString& to_nuke)
// avoid problematic regular rexpressions, e.g. xmapwpt generated [:\n:],
// or one can imagine [0-9] when we meant the characters, '0', '-', and '9',
// or one can imagine [^a] when we meant the characters '^' and 'a'.
- QRegularExpression regex = QRegularExpression(QString("[%1]").arg(QRegularExpression::escape(to_nuke)));
+ QRegularExpression regex = QRegularExpression(QStringLiteral("[%1]").arg(QRegularExpression::escape(to_nuke)));
assert(regex.isValid());
r.remove(regex);
}
diff --git a/dg-100.cc b/dg-100.cc
index 32dcd5a82..a1f31045f 100644
--- a/dg-100.cc
+++ b/dg-100.cc
@@ -203,7 +203,7 @@ Dg100Format::process_gpsfile(uint8_t data[], route_head** track) const
QDateTime creation_time = bintime2utc(bindate, bintime);
QString datetime = creation_time.toString("yyyy/MM/dd hh:mm:ss");
*track = new route_head;
- (*track)->rte_name = QString("%1 tracklog (%2)").arg(model->name, datetime);
+ (*track)->rte_name = QStringLiteral("%1 tracklog (%2)").arg(model->name, datetime);
(*track)->rte_desc = "GPS tracklog data";
track_add_head(*track);
}
diff --git a/garmin_fit.cc b/garmin_fit.cc
index 7a9227689..2e68b4995 100644
--- a/garmin_fit.cc
+++ b/garmin_fit.cc
@@ -239,7 +239,7 @@ GarminFitFormat::fit_parse_definition_message(uint8_t header)
// second byte is endianness
def.endian = fit_getuint8();
if (def.endian > 1) {
- throw ReaderException(QString("Bad endian field 0x%1 at file position 0x%2.").arg(def.endian, 0, 16).arg(gbftell(fin) - 1, 0, 16).toStdString());
+ throw ReaderException(QStringLiteral("Bad endian field 0x%1 at file position 0x%2.").arg(def.endian, 0, 16).arg(gbftell(fin) - 1, 0, 16).toStdString());
}
fit_data.endian = def.endian;
@@ -675,7 +675,7 @@ GarminFitFormat::fit_parse_data(const fit_message_def& def, int time_offset)
auto* lappt = new Waypoint;
lappt->latitude = GPS_Math_Semi_To_Deg(endlat);
lappt->longitude = GPS_Math_Semi_To_Deg(endlon);
- lappt->shortname = QString("LAP%1").arg(++lap_ct, 3, 10, QLatin1Char('0'));
+ lappt->shortname = QStringLiteral("LAP%1").arg(++lap_ct, 3, 10, QLatin1Char('0'));
waypt_add(lappt);
}
break;
diff --git a/garmin_gpi.cc b/garmin_gpi.cc
index 9c61da042..f7a0c7cdc 100644
--- a/garmin_gpi.cc
+++ b/garmin_gpi.cc
@@ -395,7 +395,7 @@ GarminGPIFormat::read_tag(const char* caller, const int tag, Waypoint* wpt)
speed = MPS_TO_KPH(speed);
}
QString base = wpt->shortname.isEmpty() ? "WPT" : wpt->shortname;
- wpt->shortname = base + QString("@%1").arg(speed,0,'f',0);
+ wpt->shortname = base + QStringLiteral("@%1").arg(speed,0,'f',0);
}
}
@@ -1230,7 +1230,7 @@ GarminGPIFormat::rd_init(const QString& fname)
read_header();
if ((codepage >= 1250) && (codepage <= 1257)) {
- QString qCodecName = QString("windows-%1").arg(codepage);
+ QString qCodecName = QStringLiteral("windows-%1").arg(codepage);
cet_convert_init(CSTR(qCodecName), 1);
} else if (codepage == 65001) {
cet_convert_init("utf8", 1);
@@ -1273,7 +1273,7 @@ GarminGPIFormat::wr_init(const QString& fname)
codepage = 0;
for (int i = 1250; i <= 1257; i++) {
- if (QString("windows-%1").arg(i).compare(QString(opt_writecodec), Qt::CaseInsensitive) == 0) {
+ if (QStringLiteral("windows-%1").arg(i).compare(QString(opt_writecodec), Qt::CaseInsensitive) == 0) {
codepage = i;
break;
}
diff --git a/garmin_tables.cc b/garmin_tables.cc
index a0f1c3e97..fb67d4b98 100644
--- a/garmin_tables.cc
+++ b/garmin_tables.cc
@@ -424,11 +424,11 @@ QString
gt_find_desc_from_icon_number(const int icon, garmin_formats_e garmin_format)
{
if ((garmin_format == GDB) && (icon >= 500) && (icon <= 563)) {
- return QString("Custom %1").arg(icon - 500);
+ return QStringLiteral("Custom %1").arg(icon - 500);
}
if ((garmin_format == PCX) && (icon >= 7680) && (icon <= 8191)) {
- return QString("Custom %1").arg(icon - 7680);
+ return QStringLiteral("Custom %1").arg(icon - 7680);
}
for (const icon_mapping_t* i = garmin_icon_table; i->icon; i++) {
diff --git a/gdb.cc b/gdb.cc
index 5e32775a5..db4608839 100644
--- a/gdb.cc
+++ b/gdb.cc
@@ -284,22 +284,22 @@ QString GdbFormat::gdb_to_ISO8601_duration(unsigned int seconds)
unsigned int days = seconds / 86400u;
QString out = "P";
if (days != 0) {
- out.append(QString("D%1").arg(days));
+ out.append(QStringLiteral("D%1").arg(days));
seconds -= 86400u * days;
}
out.append(QString("T"));
unsigned int hours = seconds / 3600u;
if (hours != 0) {
- out.append(QString("%1H").arg(hours));
+ out.append(QStringLiteral("%1H").arg(hours));
seconds -= 3600u * hours;
}
unsigned int minutes = seconds / 60u;
if (minutes != 0) {
- out.append(QString("%1M").arg(minutes));
+ out.append(QStringLiteral("%1M").arg(minutes));
seconds -= 60u * minutes;
}
if (seconds != 0) {
- out.append(QString("%1S").arg(seconds));
+ out.append(QStringLiteral("%1S").arg(seconds));
}
return out;
}
@@ -578,7 +578,7 @@ GdbFormat::read_waypoint(gt_waypt_classes_e* waypt_class_out)
res->description = FREAD_CSTR_AS_QSTR; /* instruction */
if (wpt_class == gt_waypt_class_map_intersection || wpt_class == gt_waypt_class_map_line) {
garmin_fs_t::set_duration(gmsd, duration);
- res->notes = QString("[%1]").arg(gdb_to_ISO8601_duration(duration));
+ res->notes = QStringLiteral("[%1]").arg(gdb_to_ISO8601_duration(duration));
#if GDB_DEBUG
DBG(GDB_DBG_WPTe, 1)
printf(MYNAME "-wpt \"%s\" (%d): duration = %u\n",
diff --git a/gpssim.cc b/gpssim.cc
index 76aaff528..c71f4158a 100644
--- a/gpssim.cc
+++ b/gpssim.cc
@@ -144,7 +144,7 @@ gpssim_trk_hdr(const route_head* rh)
fatal(MYNAME ": output file already open.\n");
}
- QString ofname = QString("%1%2%3.gpssim").arg(fnamestr, doing_tracks ? "-track" : "-route").arg(trk_count++, 4, 10, QChar('0'));
+ QString ofname = QStringLiteral("%1%2%3.gpssim").arg(fnamestr, doing_tracks ? "-track" : "-route").arg(trk_count++, 4, 10, QChar('0'));
fout = gbfopen(ofname, "wb", MYNAME);
}
(void) track_recompute(rh);
diff --git a/gtrnctr.cc b/gtrnctr.cc
index bc6aa0934..bbc539ff9 100644
--- a/gtrnctr.cc
+++ b/gtrnctr.cc
@@ -306,7 +306,7 @@ GtrnctrFormat::gtc_crs_hdr(const route_head* rte)
if (!rte->rte_name.isEmpty()) {
QString name = rte->rte_name.left(kGtcMaxNameLen);
- gtc_write_xml(0, QString("%1\n").arg(name));
+ gtc_write_xml(0, QStringLiteral("%1\n").arg(name));
} else {
gtc_write_xml(0, "New Course\n");
}
diff --git a/kml.cc b/kml.cc
index 4af7378e0..3abbbd4b6 100644
--- a/kml.cc
+++ b/kml.cc
@@ -391,7 +391,7 @@ void KmlFormat::wr_init(const QString& fname)
void KmlFormat::wr_position_init(const QString& fname)
{
posnfilename = fname;
- posnfilenametmp = QString("%1-").arg(fname);
+ posnfilenametmp = QStringLiteral("%1-").arg(fname);
realtime_positioning = 1;
max_position_points = atoi(opt_max_position_points);
}
@@ -842,9 +842,9 @@ void KmlFormat::kml_output_point(const Waypoint* waypointp, kml_point_type pt_ty
if (trackdirection && (pt_type == kmlpt_track)) {
QString value;
if (waypointp->speed < 1) {
- value = QString("%1-none").arg(style);
+ value = QStringLiteral("%1-none").arg(style);
} else {
- value = QString("%1-%2").arg(style)
+ value = QStringLiteral("%1-%2").arg(style)
.arg((int)(waypointp->course / 22.5 + .5) % 16);
}
writer->writeTextElement(QStringLiteral("styleUrl"), value);
@@ -1141,7 +1141,7 @@ QString KmlFormat::kml_lookup_gc_icon(const Waypoint* waypointp)
break;
}
- return QString("https://www.geocaching.com/images/kml/%1").arg(icon);
+ return QStringLiteral("https://www.geocaching.com/images/kml/%1").arg(icon);
}
const char* KmlFormat::kml_lookup_gc_container(const Waypoint* waypointp)
@@ -1184,9 +1184,9 @@ QString KmlFormat::kml_gc_mkstar(int rating)
}
if (0 == rating % 10) {
- star_content = QString("stars%1").arg(rating / 10);
+ star_content = QStringLiteral("stars%1").arg(rating / 10);
} else {
- star_content = QString("stars%1_%2").arg(rating / 10).arg(rating % 10);
+ star_content = QStringLiteral("stars%1_%2").arg(rating / 10).arg(rating % 10);
}
return star_content;
@@ -1770,7 +1770,7 @@ void KmlFormat::write()
if (trackdirection) {
kml_write_bitmap_style(kmlpt_other, ICON_TRK, "track-none");
for (int i = 0; i < 16; ++i) {
- kml_write_bitmap_style(kmlpt_other, QString(ICON_DIR).arg(i), QString("track-%1").arg(i));
+ kml_write_bitmap_style(kmlpt_other, QStringLiteral(ICON_DIR).arg(i), QStringLiteral("track-%1").arg(i));
}
} else {
kml_write_bitmap_style(kmlpt_track, ICON_TRK, nullptr);
diff --git a/lowranceusr.cc b/lowranceusr.cc
index 6e17b72ca..85b6f4c78 100644
--- a/lowranceusr.cc
+++ b/lowranceusr.cc
@@ -1549,7 +1549,7 @@ LowranceusrFormat::lowranceusr_trail_hdr(const route_head* trk)
} else if (!trk->rte_desc.isEmpty()) {
name = trk->rte_desc;
} else {
- name = name + QString("Babel %1").arg(trail_count);
+ name = name + QStringLiteral("Babel %1").arg(trail_count);
}
int text_len = name.length();
diff --git a/lowranceusr.h b/lowranceusr.h
index e51c3edd8..c42bc3b88 100644
--- a/lowranceusr.h
+++ b/lowranceusr.h
@@ -484,7 +484,7 @@ class LowranceusrFormat : public Format
}
// Didn't find it in table, default to leave it as the number found
- return QString("icon-%1").arg(icon);
+ return QStringLiteral("icon-%1").arg(icon);
}
template
diff --git a/mtk_logger.cc b/mtk_logger.cc
index 39591da3e..233aa0838 100644
--- a/mtk_logger.cc
+++ b/mtk_logger.cc
@@ -803,7 +803,7 @@ static int add_trackpoint(int idx, unsigned long bmask, struct data_item* itm)
if (global_opts.masked_objective& TRKDATAMASK && (trk_head == nullptr || (mtk_info.track_event & MTK_EVT_START))) {
char spds[50];
trk_head = new route_head;
- trk_head->rte_name = QString("track-%1").arg(1 + track_count());
+ trk_head->rte_name = QStringLiteral("track-%1").arg(1 + track_count());
spds[0] = '\0';
if (mtk_info.speed > 0) {
@@ -896,7 +896,7 @@ static int add_trackpoint(int idx, unsigned long bmask, struct data_item* itm)
/* Button press -- create waypoint, start count at 1 */
auto* w = new Waypoint(*trk);
- w->shortname = QString("WP%1").arg(waypt_count() + 1, 6, 10, QLatin1Char('0'));
+ w->shortname = QStringLiteral("WP%1").arg(waypt_count() + 1, 6, 10, QLatin1Char('0'));
waypt_add(w);
}
// In theory we would not add the waypoint to the list of
diff --git a/nmea.cc b/nmea.cc
index dac71f88b..8a3c92795 100644
--- a/nmea.cc
+++ b/nmea.cc
@@ -359,7 +359,7 @@ QTime NmeaFormat::nmea_parse_hms(const QString& str)
if (retval.isValid() && parts.size() == 2) {
bool ok;
// prepend "0.". prepending "." won't work if there are no trailing digits.
- long msec = lround(1000.0 * QString("0.%1").arg(parts.at(1)).toDouble(&ok));
+ long msec = lround(1000.0 * QStringLiteral("0.%1").arg(parts.at(1)).toDouble(&ok));
if (ok) {
retval = retval.addMSecs(msec);
} else {
@@ -631,7 +631,7 @@ NmeaFormat::gpzda_parse(const QString& ibuf)
const QStringList fields = ibuf.split(',');
if (fields.size() > 4) {
QTime time = nmea_parse_hms(fields[1]);
- QString datestr = QString("%1%2%3").arg(fields[2], fields[3], fields[4]);
+ QString datestr = QStringLiteral("%1%2%3").arg(fields[2], fields[3], fields[4]);
QDate date = QDate::fromString(datestr, "ddMMyyyy");
// The prev_datetime data member might be used by
diff --git a/osm.cc b/osm.cc
index 8929aa6c9..7e4e9077a 100644
--- a/osm.cc
+++ b/osm.cc
@@ -401,7 +401,7 @@ OsmFormat::osm_feature_symbol(const int ikey, const char* value) const
if (values.contains(key)) {
result = values.value(key)->icon;
} else {
- result = QString("%1:%2").arg(osm_features[ikey], value);
+ result = QStringLiteral("%1:%2").arg(osm_features[ikey], value);
}
return result;
}
diff --git a/ozi.cc b/ozi.cc
index 3106237fc..615b6a8a9 100644
--- a/ozi.cc
+++ b/ozi.cc
@@ -197,7 +197,7 @@ ozi_get_time_str(const Waypoint* waypointp)
{
if (waypointp->creation_time.isValid()) {
double time = (waypt_time(waypointp) / SECONDS_PER_DAY) + DAYS_SINCE_1990;
- return QString("%1").arg(time, 0, 'f', 7);
+ return QStringLiteral("%1").arg(time, 0, 'f', 7);
}
return QString("");
}
@@ -243,7 +243,7 @@ ozi_openfile(const QString& fname)
QString buff;
if ((track_out_count) && (ozi_objective == trkdata)) {
- buff = QString("-%1").arg(track_out_count);
+ buff = QStringLiteral("-%1").arg(track_out_count);
} else {
buff = QString("");
}
@@ -256,7 +256,7 @@ ozi_openfile(const QString& fname)
sname.chop(suffix_len + 1);
}
- QString tmpname = QString("%1%2.%3").arg(sname, buff, ozi_extensions[ozi_objective]);
+ QString tmpname = QStringLiteral("%1%2.%3").arg(sname, buff, ozi_extensions[ozi_objective]);
/* re-open file_out with the new filename */
if (stream != nullptr) {
diff --git a/qstarz_bl_1000.cc b/qstarz_bl_1000.cc
index ebd488f5e..739af5aeb 100644
--- a/qstarz_bl_1000.cc
+++ b/qstarz_bl_1000.cc
@@ -254,7 +254,7 @@ QstarzBL1000Format::qstarz_bl_1000_read_record(QDataStream& stream, route_head*
if (qstarz_bl_1000_is_waypoint_type(type)) {
if (global_opts.synthesize_shortnames) {
- waypoint->shortname = QString("WP%2").arg(waypt_count() + 1, 3, 10, QChar('0'));
+ waypoint->shortname = QStringLiteral("WP%2").arg(waypt_count() + 1, 3, 10, QChar('0'));
waypoint->wpt_flags.shortname_is_synthetic = 1;
}
waypt_add(waypoint);
diff --git a/route.cc b/route.cc
index 115a119fe..dea0dba26 100644
--- a/route.cc
+++ b/route.cc
@@ -339,7 +339,7 @@ computed_trkdata track_recompute(const route_head* trk)
}
if (thisw->shortname.isEmpty()) {
- thisw->shortname = QString("%1-%2").arg(trk->rte_name).arg(tkpt);
+ thisw->shortname = QStringLiteral("%1-%2").arg(trk->rte_name).arg(tkpt);
}
tkpt++;
prev = thisw;
diff --git a/skytraq.cc b/skytraq.cc
index faf55e773..6b0e3800b 100644
--- a/skytraq.cc
+++ b/skytraq.cc
@@ -606,7 +606,7 @@ SkytraqBase::make_trackpoint(struct read_state* st, double lat, double lon, doub
{
auto* wpt = new Waypoint;
- wpt->shortname = QString("TP%1").arg(++st->tpn, 4, 10, QLatin1Char('0'));
+ wpt->shortname = QStringLiteral("TP%1").arg(++st->tpn, 4, 10, QLatin1Char('0'));
wpt->latitude = lat;
wpt->longitude = lon;
diff --git a/tpo.cc b/tpo.cc
index cdd985deb..896bda59b 100644
--- a/tpo.cc
+++ b/tpo.cc
@@ -279,7 +279,7 @@ static void tpo_read_2_x()
track_add_head(track_temp);
/* generate a generic track name */
- track_temp->rte_name = QString("Track %1").arg(i+1);
+ track_temp->rte_name = QStringLiteral("Track %1").arg(i+1);
/* zoom level 1-5 visibility flags */
gbfread(&buff[0], 1, 10, tpo_file_in);
@@ -566,7 +566,7 @@ static void tpo_process_tracks()
if (tmp) {
styles[ii].name = gbfreadbuf(tmp, tpo_file_in);
} else { // Assign a generic style name
- styles[ii].name = QString("STYLE %1").arg(ii);
+ styles[ii].name = QStringLiteral("STYLE %1").arg(ii);
}
#ifdef Tracks2012
//TBD: Should this be TRACKNAMELENGTH?
@@ -1219,7 +1219,7 @@ static void tpo_process_map_notes()
Waypoint* waypoint_temp = tpo_convert_ll(lat, lon);
// Assign a generic waypoint name
- waypoint_temp->shortname = QString("NOTE %1").arg(ii + 1);
+ waypoint_temp->shortname = QStringLiteral("NOTE %1").arg(ii + 1);
//UNKNOWN DATA LENGTH
(void)tpo_read_int();
@@ -1320,7 +1320,7 @@ static void tpo_process_symbols()
Waypoint* waypoint_temp = tpo_convert_ll(lat, lon);
// Assign a generic waypoint name
- waypoint_temp->shortname = QString("SYM %1").arg(ii + 1);
+ waypoint_temp->shortname = QStringLiteral("SYM %1").arg(ii + 1);
// Add the waypoint to the chain of waypoints
waypt_add(waypoint_temp);
@@ -1363,7 +1363,7 @@ static void tpo_process_text_labels()
Waypoint* waypoint_temp = tpo_convert_ll(lat, lon);
// Assign a generic waypoint name
- waypoint_temp->shortname = QString("TXT %1").arg(ii + 1);
+ waypoint_temp->shortname = QStringLiteral("TXT %1").arg(ii + 1);
for (int jj = 0; jj < 16; jj++) {
//UNKNOWN DATA LENGTH
diff --git a/trackfilter.cc b/trackfilter.cc
index fb5f5f63d..a1a435f24 100644
--- a/trackfilter.cc
+++ b/trackfilter.cc
@@ -253,10 +253,10 @@ void TrackFilter::trackfilter_split_init_rte_name(route_head* track, const gpsba
strftime(buff, sizeof(buff), opt_title, &tm);
track->rte_name = buff;
} else {
- track->rte_name = QString("%1-%2").arg(opt_title, datetimestring);
+ track->rte_name = QStringLiteral("%1-%2").arg(opt_title, datetimestring);
}
} else if (!track->rte_name.isEmpty()) {
- track->rte_name = QString("%1-%2").arg(track->rte_name, datetimestring);
+ track->rte_name = QStringLiteral("%1-%2").arg(track->rte_name, datetimestring);
} else {
track->rte_name = datetimestring;
}
@@ -759,7 +759,7 @@ void TrackFilter::trackfilter_seg2trk()
dest->rte_num = src->rte_num;
/* name in the form TRACKNAME #n */
if (!src->rte_name.isEmpty()) {
- dest->rte_name = QString("%1 #%2").arg(src->rte_name).arg(++trk_seg_num);
+ dest->rte_name = QStringLiteral("%1 #%2").arg(src->rte_name).arg(++trk_seg_num);
}
/* Insert after original track or after last newly
diff --git a/transform.cc b/transform.cc
index 62d131828..c31df15bc 100644
--- a/transform.cc
+++ b/transform.cc
@@ -73,7 +73,7 @@ void TransformFilter::transform_rte_disp_hdr_cb(const route_head* rte)
current_trk = new route_head;
track_add_head(current_trk);
if (!rte->rte_name.isEmpty()) {
- current_trk->rte_desc = QString("Generated from route %1").arg(rte->rte_name);
+ current_trk->rte_desc = QStringLiteral("Generated from route %1").arg(rte->rte_name);
current_trk->rte_name = rte->rte_name; /* name the new trk */
}
}
diff --git a/unicsv.cc b/unicsv.cc
index 96f5a1f7a..acfd05001 100644
--- a/unicsv.cc
+++ b/unicsv.cc
@@ -1370,7 +1370,7 @@ UnicsvFormat::unicsv_waypt_disp_cb(const Waypoint* wpt)
&east, &north, &zone, &zonec, unicsv_datum_idx)) {
unicsv_fatal_outside(wpt);
}
- *fout << QString("%1").arg(zone, 2, 10, QLatin1Char('0')) << unicsv_fieldsep
+ *fout << QStringLiteral("%1").arg(zone, 2, 10, QLatin1Char('0')) << unicsv_fieldsep
<< zonec << unicsv_fieldsep
<< qSetRealNumberPrecision(0) << east << unicsv_fieldsep
<< north;
diff --git a/waypt.cc b/waypt.cc
index 59c518dc8..d87bc9b6c 100644
--- a/waypt.cc
+++ b/waypt.cc
@@ -617,7 +617,7 @@ WaypointList::waypt_add(Waypoint* wpt)
} else if (!wpt->notes.isNull()) {
wpt->shortname = wpt->notes;
} else {
- wpt->shortname = QString("WPT%1").arg(waypt_count(), 3, 10, QLatin1Char('0'));
+ wpt->shortname = QStringLiteral("WPT%1").arg(waypt_count(), 3, 10, QLatin1Char('0'));
}
}
@@ -643,7 +643,7 @@ WaypointList::add_rte_waypt(int waypt_ct, Waypoint* wpt, bool synth, const QStri
append(wpt);
if (synth && wpt->shortname.isEmpty()) {
- wpt->shortname = QString("%1%2").arg(namepart).arg(waypt_ct, number_digits, 10, QChar('0'));
+ wpt->shortname = QStringLiteral("%1%2").arg(namepart).arg(waypt_ct, number_digits, 10, QChar('0'));
wpt->wpt_flags.shortname_is_synthetic = 1;
}
}