Make fs::path::string() always return utf-8 string

ken2812221 · ken2812221 · commit 2c3eade704f6 · 2018-09-23T03:43:25.000+08:00
diff --git a/src/fs.h b/src/fs.h
@@ -10,7 +10,6 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
 
 /** Filesystem operations and types */
 namespace fs = boost::filesystem;
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -60,8 +60,6 @@
 #include <QFontDatabase>
 #endif
 
-static fs::detail::utf8_codecvt_facet utf8;
-
 namespace GUIUtil {
 
 QString dateTimeStr(const QDateTime &date)
@@ -764,12 +762,12 @@ void setClipboard(const QString& str)
 
 fs::path qstringToBoostPath(const QString &path)
 {
-    return fs::path(path.toStdString(), utf8);
+    return fs::path(path.toStdString());
 }
 
 QString boostPathToQString(const fs::path &path)
 {
-    return QString::fromStdString(path.string(utf8));
+    return QString::fromStdString(path.string());
 }
 
 QString formatDurationStr(int secs)
diff --git a/src/util.cpp b/src/util.cpp
@@ -1206,7 +1206,11 @@ void SetupEnvironment()
     // A dummy locale is used to extract the internal default locale, used by
     // fs::path, which is then used to explicitly imbue the path.
     std::locale loc = fs::path::imbue(std::locale::classic());
+#ifndef WIN32
     fs::path::imbue(loc);
+#else
+    fs::path::imbue(std::locale(loc, new std::codecvt_utf8_utf16<wchar_t>()));
+#endif
 }
 
 bool SetupNetworking()
diff --git a/test/lint/lint-includes.sh b/test/lint/lint-includes.sh
@@ -54,7 +54,6 @@ EXPECTED_BOOST_INCLUDES=(
     boost/chrono/chrono.hpp
     boost/date_time/posix_time/posix_time.hpp
     boost/filesystem.hpp
-    boost/filesystem/detail/utf8_codecvt_facet.hpp
     boost/filesystem/fstream.hpp
     boost/multi_index/hashed_index.hpp
     boost/multi_index/ordered_index.hpp

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@`
`60`	`60`	`#include <QFontDatabase>`
`61`	`61`	`#endif`
`62`	`62`
`63`		`-static fs::detail::utf8_codecvt_facet utf8;`
`64`		`-`
`65`	`63`	`namespace GUIUtil {`
`66`	`64`
`67`	`65`	`QString dateTimeStr(const QDateTime &date)`
`@@ -764,12 +762,12 @@ void setClipboard(const QString& str)`
`764`	`762`
`765`	`763`	`fs::path qstringToBoostPath(const QString &path)`
`766`	`764`	`{`
`767`		`- return fs::path(path.toStdString(), utf8);`
	`765`	`+ return fs::path(path.toStdString());`
`768`	`766`	`}`
`769`	`767`
`770`	`768`	`QString boostPathToQString(const fs::path &path)`
`771`	`769`	`{`
`772`		`- return QString::fromStdString(path.string(utf8));`
	`770`	`+ return QString::fromStdString(path.string());`
`773`	`771`	`}`
`774`	`772`
`775`	`773`	`QString formatDurationStr(int secs)`