summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorWeiyi Wang <wwylele@gmail.com>2018-09-22 06:45:50 +0200
committerfearlessTobi <thm.frey@gmail.com>2018-10-02 16:10:01 +0200
commita4595bb93947c849c8101cac6de29f9f694f26b1 (patch)
tree47d0c79fcc8e3e6382db526e3697d50b1b1fcb10 /src/common
parentMerge pull request #1407 from DarkLordZach/dlc (diff)
downloadyuzu-a4595bb93947c849c8101cac6de29f9f694f26b1.tar
yuzu-a4595bb93947c849c8101cac6de29f9f694f26b1.tar.gz
yuzu-a4595bb93947c849c8101cac6de29f9f694f26b1.tar.bz2
yuzu-a4595bb93947c849c8101cac6de29f9f694f26b1.tar.lz
yuzu-a4595bb93947c849c8101cac6de29f9f694f26b1.tar.xz
yuzu-a4595bb93947c849c8101cac6de29f9f694f26b1.tar.zst
yuzu-a4595bb93947c849c8101cac6de29f9f694f26b1.zip
Diffstat (limited to 'src/common')
-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) {
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) {
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
std::string UTF16ToUTF8(const std::u16string& input);
std::u16string UTF8ToUTF16(const std::string& input);
-std::string CP1252ToUTF8(const std::string& str);
-std::string SHIFTJISToUTF8(const std::string& str);
-
#ifdef _WIN32
std::string UTF16ToUTF8(const std::wstring& input);
std::wstring UTF8ToUTF16W(const std::string& str);