From d4c2b74afb3d7fc6bf7b4191cc8a95f182f5bef4 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Sat, 31 Oct 2020 17:10:51 -0700
Subject: [PATCH] Allow non-ASCII (UTF-8) characters in user first and last
 name in user profile

We do this by forcing a UTF-8 byte order marker in the profile.xml file.
We also add processing instructions that specify UTF-8, although it seems the BOM is itself sufficient.
---
 Htmldocs/release_notes.html    | 1 +
 oscar/SleepLib/preferences.cpp | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index 2f5f2895..0bac95ec 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -17,6 +17,7 @@
     <ul>
       <li>[fix] Correct calculation of average leak rate on Welcome page.</li>
       <li>[fix] Correct installation of non-English Release Notes on Windows.</li>
+      <li>[fix] User first and last name in Profile window may now have non-ASCII (UTF-8) characters.</li>
     </ul>
     <p>
     <b>Changes and fixes in OSCAR v1.2.0</b>
diff --git a/oscar/SleepLib/preferences.cpp b/oscar/SleepLib/preferences.cpp
index 7efae835..a4e045aa 100644
--- a/oscar/SleepLib/preferences.cpp
+++ b/oscar/SleepLib/preferences.cpp
@@ -335,6 +335,9 @@ bool Preferences::Save(QString filename)
 
     QDomDocument doc(p_name);
 
+    QDomProcessingInstruction pi = doc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\"");
+    doc.appendChild(pi);
+
     QDomElement droot = doc.createElement(STR_AppName);
     doc.appendChild(droot);
 
@@ -368,6 +371,8 @@ bool Preferences::Save(QString filename)
     }
 
     QTextStream ts(&file);
+    ts.setCodec("UTF-8");
+    ts.setGenerateByteOrderMark(true);
     ts << doc.toString();
     file.close();