summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/string_util.cpp19
-rw-r--r--src/common/string_util.h3
2 files changed, 0 insertions, 22 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index c9a5425a7..b5e28e34f 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -261,14 +261,6 @@ std::wstring UTF8ToUTF16W(const std::string& input) {
261 return CPToUTF16(CP_UTF8, input); 261 return CPToUTF16(CP_UTF8, input);
262} 262}
263 263
264std::string SHIFTJISToUTF8(const std::string& input) {
265 return UTF16ToUTF8(CPToUTF16(932, input));
266}
267
268std::string CP1252ToUTF8(const std::string& input) {
269 return UTF16ToUTF8(CPToUTF16(1252, input));
270}
271
272#else 264#else
273 265
274template <typename T> 266template <typename T>
@@ -368,17 +360,6 @@ std::string UTF16ToUTF8(const std::u16string& input) {
368 return CodeToUTF8("UTF-16LE", input); 360 return CodeToUTF8("UTF-16LE", input);
369} 361}
370 362
371std::string CP1252ToUTF8(const std::string& input) {
372 // return CodeToUTF8("CP1252//TRANSLIT", input);
373 // return CodeToUTF8("CP1252//IGNORE", input);
374 return CodeToUTF8("CP1252", input);
375}
376
377std::string SHIFTJISToUTF8(const std::string& input) {
378 // return CodeToUTF8("CP932", input);
379 return CodeToUTF8("SJIS", input);
380}
381
382#endif 363#endif
383 364
384std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, std::size_t max_len) { 365std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, std::size_t max_len) {
diff --git a/src/common/string_util.h b/src/common/string_util.h
index dcca6bc38..78b558405 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -72,9 +72,6 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
72std::string UTF16ToUTF8(const std::u16string& input); 72std::string UTF16ToUTF8(const std::u16string& input);
73std::u16string UTF8ToUTF16(const std::string& input); 73std::u16string UTF8ToUTF16(const std::string& input);
74 74
75std::string CP1252ToUTF8(const std::string& str);
76std::string SHIFTJISToUTF8(const std::string& str);
77
78#ifdef _WIN32 75#ifdef _WIN32
79std::string UTF16ToUTF8(const std::wstring& input); 76std::string UTF16ToUTF8(const std::wstring& input);
80std::wstring UTF8ToUTF16W(const std::string& str); 77std::wstring UTF8ToUTF16W(const std::string& str);