Use U8String/U16String/WString instead of UTF8String/UTF16String/WideString

This commit is contained in:
hyzboy 2024-12-24 22:40:51 +08:00
parent 8ed1f41a50
commit aa7abe4763
7 changed files with 10 additions and 10 deletions

View File

@ -88,7 +88,7 @@ namespace hgl
return(result);
}
AnsiString ToAnsiString(const CharSet &cs,const UTF16String &str)
AnsiString ToAnsiString(const CharSet &cs,const U16String &str)
{
int len;
char *ansi_str;

View File

@ -63,7 +63,7 @@ namespace hgl
}
else
{
LOG_PROBLEM(U16_TEXT("Get <")+UTF16String(path_name)+U16_TEXT("> info failedWindows error code: ")+UTF16String::numberOf((uint)GetLastError()));
LOG_PROBLEM(U16_TEXT("Get <")+U16String(path_name)+U16_TEXT("> info failedWindows error code: ")+U16String::numberOf((uint)GetLastError()));
}
if(GetDiskFreeSpaceExW(path_name,
@ -75,7 +75,7 @@ namespace hgl
}
else
{
LOG_PROBLEM(U16_TEXT("Get disk free space <")+UTF16String(path_name)+U16_TEXT("> data failed,Windows error code: ")+UTF16String::numberOf((uint)GetLastError()));
LOG_PROBLEM(U16_TEXT("Get disk free space <")+U16String(path_name)+U16_TEXT("> data failed,Windows error code: ")+U16String::numberOf((uint)GetLastError()));
}
count++;

View File

@ -43,7 +43,7 @@ namespace hgl
FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,nullptr,dw,
MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),str,0,nullptr);
LOG_ERROR(L"LoadModule <"+UTF16String(name)+L"> error! os info: "+UTF16String::numberOf(dw)+UTF16String::charOf(L',')+str);
LOG_ERROR(L"LoadModule <"+U16String(name)+L"> error! os info: "+U16String::numberOf(dw)+U16String::charOf(L',')+str);
return(false);
}

View File

@ -25,7 +25,7 @@ namespace hgl
console_handle=GetStdHandle(STD_OUTPUT_HANDLE);
}
bool Create(const UTF16String &)
bool Create(const U16String &)
{
return(true);
}

View File

@ -8,7 +8,7 @@ namespace hgl
{
class LogWinDialog:public Logger
{
UTF16String name;
U16String name;
u16char buf[4096]{};
@ -19,7 +19,7 @@ namespace hgl
name=n;
}
bool Create(const UTF16String &)
bool Create(const U16String &)
{
return(true);
}

View File

@ -171,8 +171,8 @@ namespace hgl
::GetKeyNameTextW(key,name,64);
LOG_INFO(WideString(L"Unknow Key: " )+WideString::numberOf(key)
+WideString(L" ,name: " )+WideString(name));
LOG_INFO(WString(L"Unknow Key: " )+WString::numberOf(key)
+WString(L" ,name: " )+WString(name));
}
#endif _DEBUG

View File

@ -208,7 +208,7 @@ namespace hgl
return ::WaitMessage();
}
Window *CreateRenderWindow(const WideString& win_name)
Window *CreateRenderWindow(const WString& win_name)
{
return(new WinWindow(win_name));
}