diff options
| author | bunnei <bunneidev@gmail.com> | 2014-11-13 04:56:27 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-11-13 04:56:27 +0100 |
| commit | 3cfdabb2e3594f8b380b53db2af7de41958408c6 (patch) | |
| tree | 082f1d6a5530f35f5d702bf77704e13489f6f978 /src/common/string_util.h | |
| parent | Merge pull request #188 from bunnei/apt-fixes (diff) | |
| parent | Use std::u16string for conversion between UTF-8 and UTF-16, FS:USER functions (diff) | |
| download | yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.gz yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.bz2 yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.lz yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.xz yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.zst yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.zip | |
Diffstat (limited to 'src/common/string_util.h')
| -rw-r--r-- | src/common/string_util.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/common/string_util.h b/src/common/string_util.h index a41ccc691..787a5663f 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -89,20 +89,22 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st std::string UriDecode(const std::string & sSrc); std::string UriEncode(const std::string & sSrc); +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); -std::string UTF16ToUTF8(const std::wstring& str); #ifdef _WIN32 -std::wstring UTF8ToUTF16(const std::string& str); +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 UTF8ToUTF16(str); } +{ return UTF8ToUTF16W(str); } #else inline std::string TStrToUTF8(const std::string& str) { return str; } |