From 1209d487ba12af9cab085c18aa4c3722d8e8f6d0 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Thu, 3 Sep 2020 15:57:08 +0800
Subject: [PATCH] support String.h

---
 inc/hgl/platform/Window.h |  2 +-
 src/Win/EnumVolume.cpp    |  2 +-
 src/Win/FileAccess.cpp    | 16 ++++++++--------
 src/Win/ProgramPath.cpp   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/inc/hgl/platform/Window.h b/inc/hgl/platform/Window.h
index adcc7cd..5270d14 100644
--- a/inc/hgl/platform/Window.h
+++ b/inc/hgl/platform/Window.h
@@ -1,7 +1,7 @@
 #ifndef HGL_GRAPH_WINDOW_INCLUDE
 #define HGL_GRAPH_WINDOW_INCLUDE
 
-#include<hgl/type/BaseString.h>
+#include<hgl/type/String.h>
 #include<hgl/platform/InputDevice.h>
 
 namespace hgl
diff --git a/src/Win/EnumVolume.cpp b/src/Win/EnumVolume.cpp
index 7fae473..cccfb1e 100644
--- a/src/Win/EnumVolume.cpp
+++ b/src/Win/EnumVolume.cpp
@@ -1,5 +1,5 @@
 #include<hgl/filesystem/EnumVolume.h>
-#include<hgl/type/BaseString.h>
+#include<hgl/type/String.h>
 #include<hgl/log/LogInfo.h>
 #include<windows.h>
 
diff --git a/src/Win/FileAccess.cpp b/src/Win/FileAccess.cpp
index 1374c68..ef879f4 100644
--- a/src/Win/FileAccess.cpp
+++ b/src/Win/FileAccess.cpp
@@ -19,7 +19,7 @@ namespace hgl
 
             GetTempFileNameW(PathBuffer,L"NEW",0,TempName);
 
-            return Open(TempName,fomCreate);
+            return Open(TempName,FileOpenMode::Create);
         }
 
         int OpenFile(const os_char *fn,FileOpenMode fom)
@@ -28,13 +28,13 @@ namespace hgl
 
             errno_t result;
 
-            if(fom==fomCreate       )result=_wsopen_s(&fp,fn,_O_BINARY|_O_WRONLY|_O_CREAT               ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
-            if(fom==fomCreateTrunc  )result=_wsopen_s(&fp,fn,_O_BINARY|_O_WRONLY|_O_CREAT|_O_TRUNC      ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
-//          if(fom==fomCreateTemp   )result=_wsopen_s(&fp,fn,_O_BINARY|_O_WRONLY|_O_CREAT|_O_TEMPORARY  ,_SH_DENYNO,S_IREAD|_S_IWRITE);else //某些平台不支持，所以全都不使用fomCreateTemp,统一使用CreateTemp
-            if(fom==fomOnlyRead     )result=_wsopen_s(&fp,fn,_O_BINARY|_O_RDONLY                        ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
-            if(fom==fomOnlyWrite    )result=_wsopen_s(&fp,fn,_O_BINARY|_O_WRONLY                        ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
-            if(fom==fomReadWrite    )result=_wsopen_s(&fp,fn,_O_BINARY|_O_RDWR                          ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
-            if(fom==fomAppend       )result=_wsopen_s(&fp,fn,_O_BINARY|_O_APPEND                        ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
+            if(fom==FileOpenMode::Create       )result=_wsopen_s(&fp,fn,_O_BINARY|_O_WRONLY|_O_CREAT               ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
+            if(fom==FileOpenMode::CreateTrunc  )result=_wsopen_s(&fp,fn,_O_BINARY|_O_WRONLY|_O_CREAT|_O_TRUNC      ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
+//          if(fom==FileOpenMode::CreateTemp   )result=_wsopen_s(&fp,fn,_O_BINARY|_O_WRONLY|_O_CREAT|_O_TEMPORARY  ,_SH_DENYNO,S_IREAD|_S_IWRITE);else //某些平台不支持，所以全都不使用fomCreateTemp,统一使用CreateTemp
+            if(fom==FileOpenMode::OnlyRead     )result=_wsopen_s(&fp,fn,_O_BINARY|_O_RDONLY                        ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
+            if(fom==FileOpenMode::OnlyWrite    )result=_wsopen_s(&fp,fn,_O_BINARY|_O_WRONLY                        ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
+            if(fom==FileOpenMode::ReadWrite    )result=_wsopen_s(&fp,fn,_O_BINARY|_O_RDWR                          ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
+            if(fom==FileOpenMode::Append       )result=_wsopen_s(&fp,fn,_O_BINARY|_O_APPEND                        ,_SH_DENYNO,S_IREAD|_S_IWRITE);else
                 RETURN_ERROR(-1);
 
             return(fp);
diff --git a/src/Win/ProgramPath.cpp b/src/Win/ProgramPath.cpp
index 6947a22..f7d08b3 100644
--- a/src/Win/ProgramPath.cpp
+++ b/src/Win/ProgramPath.cpp
@@ -1,4 +1,4 @@
-#include<hgl/type/BaseString.h>
+#include<hgl/type/String.h>
 #include<windows.h>
 #include<shlobj.h>