diff options
| author | archshift <admin@archshift.com> | 2014-11-10 14:36:32 -0800 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-11-12 19:30:17 -0800 |
| commit | 1f7c4ab7f6c5b65d6569a1981b04c1d2ac33b713 (patch) | |
| tree | 61693418f0cbfeddf4e416bae0d265691bf0dfa9 /src/common/string_util.h | |
| parent | 0ad5964c8b6d7141c6f2a542901a97a280edc545 (diff) | |
Use std::u16string for conversion between UTF-8 and UTF-16, FS:USER functions
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 a41ccc6916..787a5663f1 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; } |