diff --git a/src/base/Qv2rayLog.hpp b/src/base/Qv2rayLog.hpp index 98c83378..28e2a1bf 100644 --- a/src/base/Qv2rayLog.hpp +++ b/src/base/Qv2rayLog.hpp @@ -18,13 +18,7 @@ namespace Qv2ray::base #define QV2RAY_LOG_NORMAL 0 #define QV2RAY_LOG_DEBUG 1 -#ifndef Q_OS_WIN - #define Qv2ray_PRETTY_FUNCTION __PRETTY_FUNCTION__ -#else - #define Qv2ray_PRETTY_FUNCTION __FUNCSIG__ -#endif - -#define __LOG_IMPL(LEVEL, MODULE, MSG) __QV2RAY_LOG_FUNC__(LEVEL, Qv2ray_PRETTY_FUNCTION, __LINE__, MODULE, MSG); +#define __LOG_IMPL(LEVEL, MODULE, MSG) __QV2RAY_LOG_FUNC__(LEVEL, Q_FUNC_INFO, __LINE__, MODULE, MSG); #define LOG(MODULE, MSG) __LOG_IMPL(QV2RAY_LOG_NORMAL, (MODULE), (MSG)); #define DEBUG(MODULE, MSG) __LOG_IMPL(QV2RAY_LOG_DEBUG, (MODULE), (MSG)); diff --git a/src/common/CommandArgs.cpp b/src/common/CommandArgs.cpp index cd739c79..5e4c3eb1 100644 --- a/src/common/CommandArgs.cpp +++ b/src/common/CommandArgs.cpp @@ -5,12 +5,12 @@ namespace Qv2ray::common { QvCommandArgParser::QvCommandArgParser() - : QObject(), noAPIOption("noAPI", QObject::tr("Disable gRPC API subsystems.")), // - runAsRootOption("I-just-wanna-run-with-root", QObject::tr("Explicitly run Qv2ray as root.")), // - debugOption("debug", QObject::tr("Enable Debug Output")), // - hiDpiOption("hiDPI", QObject::tr("Enable HiDPI support for Qt")), // - forceHiDpiOption("hiDPI", QObject::tr("Force enable HiDPI support for Qt")), // - withToolbarOption("withToolbarPlugin", QObject::tr("Enable Qv2ray network toolbar plugin")), // + : QObject(), noAPIOption("noAPI", tr("Disable gRPC API subsystems.")), // + runAsRootOption("I-just-wanna-run-with-root", tr("Explicitly run Qv2ray as root.")), // + debugOption("debug", tr("Enable Debug Output")), // + hiDpiOption("hiDPI", tr("Enable HiDPI support for Qt")), // + forceHiDpiOption("force-hiDPI", tr("Force enable HiDPI support for Qt")), // + withToolbarOption("withToolbarPlugin", tr("Enable Qv2ray network toolbar plugin")), // // helpOption("FAKE"), versionOption("FAKE") {