diff --git a/inc/hgl/log/LogInfo.h b/inc/hgl/log/LogInfo.h index cee0a69..8cad20a 100644 --- a/inc/hgl/log/LogInfo.h +++ b/inc/hgl/log/LogInfo.h @@ -48,12 +48,12 @@ namespace hgl inline void DebugLog(LogLevel ll,const UTF16String &str,const char *filename,int line,const char *funcname) { - Log(ll,str+U16_TEXT(">>LogFrom(\"")+to_u16((u8char *)filename)+U16_TEXT("\", ")+UTF16String::valueOf(line)+U16_TEXT(" line,func:\"")+to_u16((u8char *)funcname)+U16_TEXT("\")")); + Log(ll,str+U16_TEXT(">>LogFrom(\"")+to_u16((u8char *)filename)+U16_TEXT("\", ")+UTF16String::numberOf(line)+U16_TEXT(" line,func:\"")+to_u16((u8char *)funcname)+U16_TEXT("\")")); } inline void DebugLog(LogLevel ll,const UTF8String &str,const char *filename,int line,const char *funcname) { - Log(ll,str+U8_TEXT(">>LogFrom(\"")+UTF8String((u8char *)filename)+U8_TEXT("\", ")+UTF8String::valueOf(line)+U8_TEXT(" line,func:\"")+UTF8String((u8char *)funcname)+U8_TEXT("\")")); + Log(ll,str+U8_TEXT(">>LogFrom(\"")+UTF8String((u8char *)filename)+U8_TEXT("\", ")+UTF8String::numberOf(line)+U8_TEXT(" line,func:\"")+UTF8String((u8char *)funcname)+U8_TEXT("\")")); } #define LOG_INFO(str) {Log(LogLevel::Log, str);} @@ -62,7 +62,7 @@ namespace hgl #define LOG_ERROR(str) {Log(LogLevel::Error, str);} #define RETURN_FALSE {DebugLog(LogLevel::Log,OS_TEXT("return(false)"), __FILE__,__LINE__,__HGL_FUNC__);return(false);} - #define RETURN_ERROR(v) {DebugLog(LogLevel::Log,OS_TEXT("return error(")+OSString::valueOf(v)+OS_TEXT(")"), __FILE__,__LINE__,__HGL_FUNC__);return(v);} + #define RETURN_ERROR(v) {DebugLog(LogLevel::Log,OS_TEXT("return error(")+OSString::numberOf(v)+OS_TEXT(")"), __FILE__,__LINE__,__HGL_FUNC__);return(v);} #define RETURN_ERROR_NULL {DebugLog(LogLevel::Log,OS_TEXT("return error(nullptr)"), __FILE__,__LINE__,__HGL_FUNC__);return(nullptr);} #define RETURN_BOOL(proc) {if(proc)return(true);RETURN_FALSE} diff --git a/inc/hgl/type/String.h b/inc/hgl/type/String.h index d526ea1..b2e0c92 100644 --- a/inc/hgl/type/String.h +++ b/inc/hgl/type/String.h @@ -111,7 +111,7 @@ namespace hgl #define BASE_STRING_NUMBER_CONSTRUCT(type,func) \ String(const type num)=delete; \ - static String valueOf(const type value) \ + static String numberOf(const type value) \ { \ StringInstance *si=new StringInstance(); \ \ @@ -137,7 +137,7 @@ namespace hgl String(const int *value,int N)=delete; - static String valueOf(const int *value,int N) + static String numberOf(const int *value,int N) { const int size=N*sizeof(int)*8; int len; @@ -160,7 +160,7 @@ namespace hgl String(const float *value,int N)=delete; - static String valueOf(const float *value,int N) + static String numberOf(const float *value,int N) { const int size=N*sizeof(float)*16; int len; diff --git a/src/FileSystem/FileSystem.cpp b/src/FileSystem/FileSystem.cpp index db2f693..84dff2b 100644 --- a/src/FileSystem/FileSystem.cpp +++ b/src/FileSystem/FileSystem.cpp @@ -300,7 +300,7 @@ namespace hgl if(offset+length>file_length) { - LOG_PROBLEM(OS_TEXT("读取文件<")+filename+OS_TEXT("><")+OSString::valueOf(offset)+OS_TEXT(",")+OSString::valueOf(length)+OS_TEXT(">超出了范围,文件长度为<")+OSString::valueOf(file_length)); + LOG_PROBLEM(OS_TEXT("读取文件<")+filename+OS_TEXT("><")+OSString::numberOf(offset)+OS_TEXT(",")+OSString::numberOf(length)+OS_TEXT(">超出了范围,文件长度为<")+OSString::numberOf(file_length)); return(nullptr); } @@ -313,7 +313,7 @@ namespace hgl if(fs.Read(offset,fb,length)==length) { - LOG_INFO(OS_TEXT("加载文件<")+filename+OS_TEXT("><")+OSString::valueOf(offset)+OS_TEXT(",")+OSString::valueOf(length)+OS_TEXT(">到缓冲区成功.")); + LOG_INFO(OS_TEXT("加载文件<")+filename+OS_TEXT("><")+OSString::numberOf(offset)+OS_TEXT(",")+OSString::numberOf(length)+OS_TEXT(">到缓冲区成功.")); return(buf); } diff --git a/src/Log/Loginfo.cpp b/src/Log/Loginfo.cpp index 155b3c6..3aec9a7 100644 --- a/src/Log/Loginfo.cpp +++ b/src/Log/Loginfo.cpp @@ -64,12 +64,12 @@ namespace hgl filesystem::GetCurrentProgram(cur_program); const OSString str= OS_TEXT("Starting Log at ")+ - OSString::valueOf(d.GetYear ())+OS_TEXT("-")+ - OSString::valueOf(d.GetMonth ())+OS_TEXT("-")+ - OSString::valueOf(d.GetDay ())+OS_TEXT(" ")+ - OSString::valueOf(t.GetHour ())+OS_TEXT(":")+ - OSString::valueOf(t.GetMinute())+OS_TEXT(":")+ - OSString::valueOf(t.GetSecond())+OS_TEXT("\n")+ + OSString::numberOf(d.GetYear ())+OS_TEXT("-")+ + OSString::numberOf(d.GetMonth ())+OS_TEXT("-")+ + OSString::numberOf(d.GetDay ())+OS_TEXT(" ")+ + OSString::numberOf(t.GetHour ())+OS_TEXT(":")+ + OSString::numberOf(t.GetMinute())+OS_TEXT(":")+ + OSString::numberOf(t.GetSecond())+OS_TEXT("\n")+ OS_TEXT("Current program: ") + cur_program.c_str() + OS_TEXT("\n")+ OS_TEXT("Current path: ") + cur_path.c_str() + OS_TEXT("\n");