summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeiyi Wang <wwylele@gmail.com>2018-09-22 06:52:38 +0200
committerfearlessTobi <thm.frey@gmail.com>2018-10-02 16:10:20 +0200
commitbfe84f06f2de966b68026f5b3f4212fd2ba783b6 (patch)
treea5d3e6cbcfd520fde820edf83fbace8c174e9818
parentstring_util: remove ShiftJIS/CP1252 conversion function (diff)
downloadyuzu-bfe84f06f2de966b68026f5b3f4212fd2ba783b6.tar
yuzu-bfe84f06f2de966b68026f5b3f4212fd2ba783b6.tar.gz
yuzu-bfe84f06f2de966b68026f5b3f4212fd2ba783b6.tar.bz2
yuzu-bfe84f06f2de966b68026f5b3f4212fd2ba783b6.tar.lz
yuzu-bfe84f06f2de966b68026f5b3f4212fd2ba783b6.tar.xz
yuzu-bfe84f06f2de966b68026f5b3f4212fd2ba783b6.tar.zst
yuzu-bfe84f06f2de966b68026f5b3f4212fd2ba783b6.zip
-rw-r--r--src/common/file_util.h2
-rw-r--r--src/common/string_util.h18
2 files changed, 1 insertions, 19 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 3d8fe6264..571503d2a 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -285,7 +285,7 @@ private:
template <typename T>
void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode) {
#ifdef _MSC_VER
- fstream.open(Common::UTF8ToTStr(filename).c_str(), openmode);
+ fstream.open(Common::UTF8ToUTF16W(filename).c_str(), openmode);
#else
fstream.open(filename.c_str(), openmode);
#endif
diff --git a/src/common/string_util.h b/src/common/string_util.h
index 78b558405..32bf6a19c 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -76,24 +76,6 @@ std::u16string UTF8ToUTF16(const std::string& input);
std::string UTF16ToUTF8(const std::wstring& input);
std::wstring UTF8ToUTF16W(const std::string& str);
-#ifdef _UNICODE
-inline std::string TStrToUTF8(const std::wstring& str) {
- return UTF16ToUTF8(str);
-}
-
-inline std::wstring UTF8ToTStr(const std::string& str) {
- return UTF8ToUTF16W(str);
-}
-#else
-inline std::string TStrToUTF8(const std::string& str) {
- return str;
-}
-
-inline std::string UTF8ToTStr(const std::string& str) {
- return str;
-}
-#endif
-
#endif
/**