diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-17 08:55:19 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-17 08:55:19 +0100 |
| commit | 73691a8587e5f09ef138384d2ff97e4059ba9380 (patch) | |
| tree | 1b5509192851cdd3e6c09251c0051b33d8d3ca15 /Source/Core/Common/StringUtil.cpp | |
| parent | a8ca2c6cc2ed6177bd26b6c022b919179a8ce37a (diff) | |
| parent | 3fd87a7636ff434118a5d7f7334550be8db55c0b (diff) | |
Merge pull request #86 from lioncash/vertical-alignments2-electric-boogaloo
Second and final pass of clearing out tabs.
Diffstat (limited to 'Source/Core/Common/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/StringUtil.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 7ad4ac6ca5..7d8825231e 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -520,11 +520,7 @@ std::string SHIFTJISToUTF8(const std::string& input) std::string UTF16ToUTF8(const std::wstring& input) { - std::string result = - // CodeToUTF8("UCS-2", input); - // CodeToUTF8("UCS-2LE", input); - // CodeToUTF8("UTF-16", input); - CodeToUTF8("UTF-16LE", input); + std::string result = CodeToUTF8("UTF-16LE", input); // TODO: why is this needed? result.erase(std::remove(result.begin(), result.end(), 0x00), result.end()); |
