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

used "enum class" instead of "enum" in logger

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-01-16 19:10:49 +08:00
parent d6917e9339
commit 47f2c4c71a
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,13 +16,13 @@ namespace hgl
{ {
namespace logger namespace logger
{ {
enum LogLevel enum class LogLevel
{ {
llError=0, //错误，肯定出对话框 Error=0, //错误，肯定出对话框
llProblem, //问题，默认出对话框 Problem, //问题，默认出对话框
llHint, //提示，不重要，debug状态默认出对话框 Hint, //提示，不重要，debug状态默认出对话框
llLog //记录一下 Log //记录一下
};//enum LogLevel };//enum class LogLevel
bool InitLogger(const OSString &app_name); bool InitLogger(const OSString &app_name);
@@ -56,14 +56,14 @@ namespace hgl
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::valueOf(line)+U8_TEXT(" line,func:\"")+UTF8String((u8char *)funcname)+U8_TEXT("\")"));
} }
#define LOG_INFO(str) {Log(llLog, str);} #define LOG_INFO(str) {Log(LogLevel::Log, str);}
#define LOG_HINT(str) {Log(llHint, str);} #define LOG_HINT(str) {Log(LogLevel::Hint, str);}
#define LOG_PROBLEM(str) {Log(llProblem, str);} #define LOG_PROBLEM(str) {Log(LogLevel::Problem, str);}
#define LOG_ERROR(str) {Log(llError, str);} #define LOG_ERROR(str) {Log(LogLevel::Error, str);}
#define RETURN_FALSE {DebugLog(llLog,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(llLog,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::valueOf(v)+OS_TEXT(")"), __FILE__,__LINE__,__HGL_FUNC__);return(v);}
#define RETURN_ERROR_NULL {DebugLog(llLog,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}

2
src/Log/LogFile.cpp
View File

@@ -101,7 +101,7 @@ namespace hgl
Logger *CreateLoggerFile(const OSString &pc,LogLevel ll) Logger *CreateLoggerFile(const OSString &pc,LogLevel ll)
{ {
if(ll<llError) if(ll<LogLevel::Error)
return(nullptr); return(nullptr);
LogFile *lf=new LogFile(ll); LogFile *lf=new LogFile(ll);

6
src/Log/Loginfo.cpp
View File

@@ -73,7 +73,7 @@ namespace hgl
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");
WriteLog(llLog,str.c_str(),str.Length()); WriteLog(LogLevel::Log,str.c_str(),str.Length());
return(true); return(true);
} }
@@ -207,8 +207,8 @@ namespace hgl
*/ */
bool InitLogger(const OSString &app_name) bool InitLogger(const OSString &app_name)
{ {
AddLogger(CreateLoggerConsole(llLog)); AddLogger(CreateLoggerConsole(LogLevel::Log));
AddLogger(CreateLoggerFile(app_name,llLog)); AddLogger(CreateLoggerFile(app_name,LogLevel::Log));
return InitLog(); return InitLog();
} }