From 84c29e8610ade8dfd15f25f73db5aee0a5340571 Mon Sep 17 00:00:00 2001
From: Andreas Buhr <andreas@andreasbuhr.de>
Date: Tue, 9 Jan 2024 20:40:45 +0100
Subject: [PATCH] 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
---
 src/Core/Measures.cpp        |  2 +-
 src/Core/RideItem.cpp        |  4 ++--
 src/FileIO/JsonRideFile.y    |  4 ++--
 src/Gui/Colors.cpp           |  2 +-
 src/Metrics/RideMetadata.cpp | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Core/Measures.cpp b/src/Core/Measures.cpp
index 655df4705..f5ee22b4d 100644
--- a/src/Core/Measures.cpp
+++ b/src/Core/Measures.cpp
@@ -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());
 }
diff --git a/src/Core/RideItem.cpp b/src/Core/RideItem.cpp
index d53b86599..c295cec37 100644
--- a/src/Core/RideItem.cpp
+++ b/src/Core/RideItem.cpp
@@ -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());
 }
diff --git a/src/FileIO/JsonRideFile.y b/src/FileIO/JsonRideFile.y
index ac63769e1..f08b4638c 100644
--- a/src/FileIO/JsonRideFile.y
+++ b/src/FileIO/JsonRideFile.y
@@ -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)
diff --git a/src/Gui/Colors.cpp b/src/Gui/Colors.cpp
index b2838ff72..e9e763339 100644
--- a/src/Gui/Colors.cpp
+++ b/src/Gui/Colors.cpp
@@ -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());
diff --git a/src/Metrics/RideMetadata.cpp b/src/Metrics/RideMetadata.cpp
index 342e2ffbb..33a4560db 100644
--- a/src/Metrics/RideMetadata.cpp
+++ b/src/Metrics/RideMetadata.cpp
@@ -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());