From f2ad8ce5bf2c669aa32aef5be65f2957d624dba6 Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@outlook.com>
Date: Sat, 28 May 2022 20:32:04 +0800
Subject: [PATCH] renamed few functions at StdString.h

---
 inc/hgl/type/StdString.h | 76 ++++++++++++++++++++++++++++------------
 1 file changed, 53 insertions(+), 23 deletions(-)

diff --git a/inc/hgl/type/StdString.h b/inc/hgl/type/StdString.h
index b72fd84..1a155e4 100644
--- a/inc/hgl/type/StdString.h
+++ b/inc/hgl/type/StdString.h
@@ -4,31 +4,61 @@
 #include<hgl/type/String.h>
 #include<hgl/CodePage.h>
 
-#if HGL_OS == HGL_OS_Windows
-inline hgl::OSString std_to_os(const std::string &str)
+namespace hgl
 {
-    return hgl::to_u16((hgl::u8char *)str.c_str(),(int)(str.length()));
-}
+    #if HGL_OS == HGL_OS_Windows
+    inline hgl::OSString ToOSString(const std::string &str)
+    {
+        return hgl::to_u16((hgl::u8char *)str.c_str(),(int)(str.length()));
+    }
 
-inline std::string to_std(const hgl::OSString &str)
-{
-    hgl::UTF8String u8_str=hgl::to_u8(str);
+    inline hgl::OSString ToOSString(const std::wstring &str)
+    {
+        return hgl::OSString(str.c_str(),(int)str.length());
+    }
 
-    return std::string((char *)u8_str.c_str(),str.Length());
-}
-#else
-inline hgl::OSString std_to_os(const std::string &str)
-{
-    return hgl::OSString(str.c_str(),str.size());
-}
+    inline hgl::UTF8String ToUTF8String(const std::wstring &str)
+    {
+        return hgl::to_u8(str.c_str(),(int)str.length());
+    }
 
-inline std::string to_std(const hgl::OSString &str)
-{
-    return std::string(str.c_str(),str.Length());
-}
-#endif//
+    inline std::string ToStdString(const hgl::OSString &str)
+    {
+        hgl::UTF8String u8_str=hgl::to_u8(str);
 
-inline hgl::UTF8String std_to_u8(const std::string &str)
-{
-    return hgl::UTF8String((hgl::u8char *)str.c_str(),int(str.size()));
-}
+        return std::string((char *)u8_str.c_str(),str.Length());
+    }
+
+    inline std::wstring ToStdWString(const hgl::OSString &str)
+    {
+        return std::wstring(str.c_str(),str.Length());
+    }
+    #else
+    inline hgl::OSString ToOSString(const std::string &str)
+    {
+        return hgl::OSString(str.c_str(),str.size());
+    }
+
+    inline hgl::OSString ToOSString(const std::wstring &str)
+    {
+        return hgl::to_u8(str.c_str(),str.size());
+    }
+
+    inline std::string ToStdString(const hgl::OSString &str)
+    {
+        return std::string(str.c_str(),str.Length());
+    }
+
+    inline std::wstring ToStdWString(const OSString &str)
+    {
+        hgl::WideString w_str=hgl::to_wide<sizeof(wchar_t)>(str);
+
+        return std::wstring(w_str.c_str(),w_str.Length());
+    }
+    #endif//
+
+    inline hgl::UTF8String ToUTF8String(const std::string &str)
+    {
+        return hgl::UTF8String((hgl::u8char *)str.c_str(),int(str.size()));
+    }
+}
\ No newline at end of file