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