Merge pull request #1588 from Joern-R/UTF-8-Text-Output

XML Ridefile Formats exports - error on Windows
GoldenCheetah · Oct 9, 2015 · 520f92e · 520f92e
2 parents 3273ba8 + 0267eec
commit 520f92e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/src/FitlogRideFile.cpp b/src/FitlogRideFile.cpp
@@ -233,7 +233,12 @@ FitlogFileReader::writeRideFile(Context *context, const RideFile *ride, QFile &f
 
     QByteArray xml = doc.toByteArray(4);
     if (!file.open(QIODevice::WriteOnly)) return(false);
-    if (file.write(xml) != xml.size()) return(false);
+    file.resize(0);
+    QTextStream out(&file);
+    out.setCodec("UTF-8");
+    out.setGenerateByteOrderMark(true);
+    out << xml;
+    out.flush();
     file.close();
     return(true);
 }
diff --git a/src/GcRideFile.cpp b/src/GcRideFile.cpp
@@ -270,8 +270,12 @@ GcFileReader::writeRideFile(Context *,const RideFile *ride, QFile &file) const
     QByteArray xml = doc.toByteArray(4);
     if (!file.open(QIODevice::WriteOnly))
         return false;
-    if (file.write(xml) != xml.size())
-        return false;
+    file.resize(0);
+    QTextStream out(&file);
+    out.setCodec("UTF-8");
+    out.setGenerateByteOrderMark(true);
+    out << xml;
+    out.flush();
     file.close();
     return true;
 }
diff --git a/src/PwxRideFile.cpp b/src/PwxRideFile.cpp
@@ -888,7 +888,12 @@ PwxFileReader::writeRideFile(Context *context, const RideFile *ride, QFile &file
 
     QByteArray xml = doc.toByteArray(4);
     if (!file.open(QIODevice::WriteOnly)) return(false);
-    if (file.write(xml) != xml.size()) return(false);
+    file.resize(0);
+    QTextStream out(&file);
+    out.setCodec("UTF-8");
+    out.setGenerateByteOrderMark(true);
+    out << xml;
+    out.flush();
     file.close();
     return(true);
 }
diff --git a/src/TcxRideFile.cpp b/src/TcxRideFile.cpp
@@ -415,7 +415,12 @@ TcxFileReader::writeRideFile(Context *context, const RideFile *ride, QFile &file
     QByteArray xml = toByteArray(context, ride, true, true, true, true);
 
     if (!file.open(QIODevice::WriteOnly)) return(false);
-    if (file.write(xml) != xml.size()) return(false);
+    file.resize(0);
+    QTextStream out(&file);
+    out.setCodec("UTF-8");
+    out.setGenerateByteOrderMark(true);
+    out << xml;
+    out.flush();
     file.close();
     return(true);
 }