hyzboy/CMCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed to "numberOf" instead of "valueOf" at String class.

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-02-03 17:41:17 +08:00
parent 68d0082e0e
commit 1600b4b1b0
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/hgl/log/LogInfo.h
View File

@ -48,12 +48,12 @@ namespace hgl
inline void DebugLog(LogLevel ll,const UTF16String &str,const char *filename,int line,const char *funcname) 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) 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);} #define LOG_INFO(str) {Log(LogLevel::Log, str);}
@ -62,7 +62,7 @@ namespace hgl
#define LOG_ERROR(str) {Log(LogLevel::Error, str);} #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_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_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} #define RETURN_BOOL(proc) {if(proc)return(true);RETURN_FALSE}

6
inc/hgl/type/String.h
View File

@ -111,7 +111,7 @@ namespace hgl
#define BASE_STRING_NUMBER_CONSTRUCT(type,func) \ #define BASE_STRING_NUMBER_CONSTRUCT(type,func) \
String(const type num)=delete; \ String(const type num)=delete; \
static String<T> valueOf(const type value) \ static String<T> numberOf(const type value) \
{ \ { \
StringInstance<T> *si=new StringInstance<T>(); \ StringInstance<T> *si=new StringInstance<T>(); \
\ \
@ -137,7 +137,7 @@ namespace hgl
String(const int *value,int N)=delete; String(const int *value,int N)=delete;
static String<T> valueOf(const int *value,int N) static String<T> numberOf(const int *value,int N)
{ {
const int size=N*sizeof(int)*8; const int size=N*sizeof(int)*8;
int len; int len;
@ -160,7 +160,7 @@ namespace hgl
String(const float *value,int N)=delete; String(const float *value,int N)=delete;
static String<T> valueOf(const float *value,int N) static String<T> numberOf(const float *value,int N)
{ {
const int size=N*sizeof(float)*16; const int size=N*sizeof(float)*16;
int len; int len;

4
src/FileSystem/FileSystem.cpp
View File

@ -300,7 +300,7 @@ namespace hgl
if(offset+length>file_length) 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); return(nullptr);
} }
@ -313,7 +313,7 @@ namespace hgl
if(fs.Read(offset,fb,length)==length) 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); return(buf);
} }

12
src/Log/Loginfo.cpp
View File

@ -64,12 +64,12 @@ namespace hgl
filesystem::GetCurrentProgram(cur_program); filesystem::GetCurrentProgram(cur_program);
const OSString str= OS_TEXT("Starting Log at ")+ const OSString str= OS_TEXT("Starting Log at ")+
OSString::valueOf(d.GetYear ())+OS_TEXT("-")+ OSString::numberOf(d.GetYear ())+OS_TEXT("-")+
OSString::valueOf(d.GetMonth ())+OS_TEXT("-")+ OSString::numberOf(d.GetMonth ())+OS_TEXT("-")+
OSString::valueOf(d.GetDay ())+OS_TEXT(" ")+ OSString::numberOf(d.GetDay ())+OS_TEXT(" ")+
OSString::valueOf(t.GetHour ())+OS_TEXT(":")+ OSString::numberOf(t.GetHour ())+OS_TEXT(":")+
OSString::valueOf(t.GetMinute())+OS_TEXT(":")+ OSString::numberOf(t.GetMinute())+OS_TEXT(":")+
OSString::valueOf(t.GetSecond())+OS_TEXT("\n")+ OSString::numberOf(t.GetSecond())+OS_TEXT("\n")+
OS_TEXT("Current program: ") + cur_program.c_str() + 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"); OS_TEXT("Current path: ") + cur_path.c_str() + OS_TEXT("\n");