diff options
| author | Weiyi Wang <wwylele@gmail.com> | 2018-09-22 00:45:50 -0400 |
|---|---|---|
| committer | fearlessTobi <thm.frey@gmail.com> | 2018-10-02 16:10:01 +0200 |
| commit | a4595bb93947c849c8101cac6de29f9f694f26b1 (patch) | |
| tree | 47d0c79fcc8e3e6382db526e3697d50b1b1fcb10 /src/common/string_util.cpp | |
| parent | bd14f397ce142f4552018554532ceb230e12bde5 (diff) | |
string_util: remove ShiftJIS/CP1252 conversion function
We always use unicode internally. Any dirty work of conversion with other codec should be handled by frontend framework (Qt). Further more, ShiftJIS/CP1252 are not special (they are not code set used by 3ds, or any guest/host dependencies we have), so there is no reason to specifically include them
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index c9a5425a7d..b5e28e34fc 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -261,14 +261,6 @@ std::wstring UTF8ToUTF16W(const std::string& input) { return CPToUTF16(CP_UTF8, input); } -std::string SHIFTJISToUTF8(const std::string& input) { - return UTF16ToUTF8(CPToUTF16(932, input)); -} - -std::string CP1252ToUTF8(const std::string& input) { - return UTF16ToUTF8(CPToUTF16(1252, input)); -} - #else template <typename T> @@ -368,17 +360,6 @@ std::string UTF16ToUTF8(const std::u16string& input) { return CodeToUTF8("UTF-16LE", input); } -std::string CP1252ToUTF8(const std::string& input) { - // return CodeToUTF8("CP1252//TRANSLIT", input); - // return CodeToUTF8("CP1252//IGNORE", input); - return CodeToUTF8("CP1252", input); -} - -std::string SHIFTJISToUTF8(const std::string& input) { - // return CodeToUTF8("CP932", input); - return CodeToUTF8("SJIS", input); -} - #endif std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, std::size_t max_len) { |