summaryrefslogtreecommitdiff
path: root/src/common/string_util.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-10-03 18:44:51 -0400
committerGitHub <noreply@github.com>2018-10-03 18:44:51 -0400
commit137d43fa2f8060ee9052f7541a34b900ecbc7ff0 (patch)
tree3927c204eda84d63db274f615b7c69137f12dc9c /src/common/string_util.h
parent8679934693d7db11c18fc22b7bac5c4c826e0eac (diff)
parentfdb35760a77719a9f79c04c2b55cb5a7ba6c1d8c (diff)
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.h21
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
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);
-#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
/**