1 files changed, 11 insertions, 6 deletions
diff --git a/src/common/string_util.h b/src/common/string_util.h
index ba4cd363e..787a5663f 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -12,11 +12,13 @@
 
 #include "common/common.h"
 
+namespace Common {
+
 /// Make a string lowercase
-void LowerStr(char* str);
+std::string ToLower(std::string str);
 
 /// Make a string uppercase
-void UpperStr(char* str);
+std::string ToUpper(std::string str);
 
 std::string StringFromFormat(const char* format, ...);
 // Cheap!
@@ -52,7 +54,6 @@ std::string ThousandSeparate(I value, int spaces = 0)
     return oss.str();
 }
 
-std::string StringFromInt(int value);
 std::string StringFromBool(bool value);
 
 bool TryParse(const std::string &str, bool *output);
@@ -88,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; }
@@ -111,3 +114,5 @@ inline std::string UTF8ToTStr(const std::string& str)
 #endif
 
 #endif
+
+}