diff options
| author | 2018-10-03 18:44:51 -0400 | |
|---|---|---|
| committer | 2018-10-03 18:44:51 -0400 | |
| commit | 137d43fa2f8060ee9052f7541a34b900ecbc7ff0 (patch) | |
| tree | 3927c204eda84d63db274f615b7c69137f12dc9c /src/common/string_util.h | |
| parent | Merge pull request #1435 from lioncash/xci (diff) | |
| parent | string_util: unify UTF8<->UTF16 conversion to codecvt (diff) | |
| download | yuzu-137d43fa2f8060ee9052f7541a34b900ecbc7ff0.tar.gz yuzu-137d43fa2f8060ee9052f7541a34b900ecbc7ff0.tar.xz yuzu-137d43fa2f8060ee9052f7541a34b900ecbc7ff0.zip | |
Merge pull request #1426 from FearlessTobi/port-4253
Port citra-emu/citra#4253: "common/string_util cleanup"
Diffstat (limited to 'src/common/string_util.h')
| -rw-r--r-- | src/common/string_util.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/common/string_util.h b/src/common/string_util.h index dcca6bc38..32bf6a19c 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h | |||
| @@ -72,31 +72,10 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st | |||
| 72 | std::string UTF16ToUTF8(const std::u16string& input); | 72 | std::string UTF16ToUTF8(const std::u16string& input); |
| 73 | std::u16string UTF8ToUTF16(const std::string& input); | 73 | std::u16string UTF8ToUTF16(const std::string& input); |
| 74 | 74 | ||
| 75 | std::string CP1252ToUTF8(const std::string& str); | ||
| 76 | std::string SHIFTJISToUTF8(const std::string& str); | ||
| 77 | |||
| 78 | #ifdef _WIN32 | 75 | #ifdef _WIN32 |
| 79 | std::string UTF16ToUTF8(const std::wstring& input); | 76 | std::string UTF16ToUTF8(const std::wstring& input); |
| 80 | std::wstring UTF8ToUTF16W(const std::string& str); | 77 | std::wstring UTF8ToUTF16W(const std::string& str); |
| 81 | 78 | ||
| 82 | #ifdef _UNICODE | ||
| 83 | inline std::string TStrToUTF8(const std::wstring& str) { | ||
| 84 | return UTF16ToUTF8(str); | ||
| 85 | } | ||
| 86 | |||
| 87 | inline std::wstring UTF8ToTStr(const std::string& str) { | ||
| 88 | return UTF8ToUTF16W(str); | ||
| 89 | } | ||
| 90 | #else | ||
| 91 | inline std::string TStrToUTF8(const std::string& str) { | ||
| 92 | return str; | ||
| 93 | } | ||
| 94 | |||
| 95 | inline std::string UTF8ToTStr(const std::string& str) { | ||
| 96 | return str; | ||
| 97 | } | ||
| 98 | #endif | ||
| 99 | |||
| 100 | #endif | 79 | #endif |
| 101 | 80 | ||
| 102 | /** | 81 | /** |