Specify text encoding in several places (#3935)

Conversion from QString to QByteArray is deprecated in Qt 6.
It will be required to specify the encoding. This patch
adapts several places to specify the encoding as UTF8.
This should be no behavior change, as encoding in UTF8 was the
default in the now deprecated methods, see
https://doc.qt.io/qt-5/qbytearray-obsolete.html#operator-2b-eq-3
This commit is contained in:
Andreas Buhr
2024-01-09 20:40:45 +01:00
committed by GitHub
parent 413c3b6086
commit 84c29e8610
5 changed files with 12 additions and 12 deletions

View File

@@ -42,7 +42,7 @@ Measure::getFingerprint() const
for (int i = 0; i<MAX_MEASURES; i++) x += 1000.0 * values[i];
QByteArray ba = QByteArray::number(x);
ba.append(comment);
ba.append(comment.toUtf8());
return qChecksum(ba, ba.length());
}

View File

@@ -165,8 +165,8 @@ RideItem::metaCRC()
// with configuration, not user updates
if (i.key() == "Calendar Text") continue;
ba.append(i.key());
ba.append(i.value());
ba.append(i.key().toUtf8());
ba.append(i.value().toUtf8());
}
return qChecksum(ba, ba.length());
}

View File

@@ -468,7 +468,7 @@ JsonFileReader::openRideFile(QFile &file, QStringList &errors, QList<RideFile*>*
QByteArray
JsonFileReader::toByteArray(Context *, const RideFile *ride, bool withAlt, bool withWatts, bool withHr, bool withCad) const
{
QByteArray out;
QString out;
// start of document and ride
out += "{\n\t\"RIDE\":{\n";
@@ -780,7 +780,7 @@ JsonFileReader::toByteArray(Context *, const RideFile *ride, bool withAlt, bool
// end of ride and document
out += "\n\t}\n}\n";
return out;
return out.toUtf8();
}
// Writes valid .json (validated at www.jsonlint.com)

View File

@@ -104,7 +104,7 @@ unsigned long Colors::fingerprint(const Colors *set)
{
QByteArray ba;
while(set->name != "") {
ba.append(set->color.name());
ba.append(set->color.name().toUtf8());
set++;
}
return qChecksum(ba, ba.length());

View File

@@ -1588,11 +1588,11 @@ FieldDefinition::fingerprint(QList<FieldDefinition> list)
foreach(FieldDefinition def, list) {
ba.append(def.tab);
ba.append(def.name);
ba.append(def.tab.toUtf8());
ba.append(def.name.toUtf8());
ba.append(def.type);
ba.append(def.diary);
ba.append(def.values.join(""));
ba.append(def.values.join("").toUtf8());
}
return qChecksum(ba, ba.length());
@@ -1651,9 +1651,9 @@ KeywordDefinition::fingerprint(QList<KeywordDefinition> list)
foreach(KeywordDefinition def, list) {
ba.append(def.name);
ba.append(def.color.name());
ba.append(def.tokens.join(""));
ba.append(def.name.toUtf8());
ba.append(def.color.name().toUtf8());
ba.append(def.tokens.join("").toUtf8());
}
return qChecksum(ba, ba.length());