rename A -> QVLOG_A

Qv2ray · Jul 11, 2023 · b308056 · b308056
1 parent aea9981
commit b308056
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/base/Qv2rayLog.hpp b/src/base/Qv2rayLog.hpp
@@ -14,8 +14,8 @@
 #endif
 
 #define NEWLINE "\r\n"
-#define ___LOG_EXPAND(___x) , QPair<std::string, decltype(___x)>(std::string(#___x), [&] { return ___x; }())
-#define A(...) FOREACH_CALL_FUNC(___LOG_EXPAND, __VA_ARGS__)
+#define QVLOG_A_DO_EXPAND(___x) , QPair<std::string, decltype(___x)>(std::string(#___x), [&] { return ___x; }())
+#define QVLOG_A(...) FOREACH_CALL_FUNC(QVLOG_A_DO_EXPAND, __VA_ARGS__)
 
 #ifdef QT_DEBUG
 #define QV2RAY_IS_DEBUG true

diff --git a/src/core/settings/SettingsBackend.cpp b/src/core/settings/SettingsBackend.cpp
@@ -87,7 +87,7 @@ namespace Qv2ray::core::config
 
         // If the file format is valid.
         const auto conf = JsonFromString(StringFromFile(configFile));
-        LOG("Found a config file," A(conf["config_version"].toString()) A(path));
+        LOG("Found a config file," QVLOG_A(conf["config_version"].toString()) QVLOG_A(path));
         configFile.close();
         return true;
     }

diff --git a/src/ui/Qv2rayPlatformApplication.cpp b/src/ui/Qv2rayPlatformApplication.cpp
@@ -39,7 +39,7 @@ bool Qv2rayPlatformApplication::Initialize()
     const auto hasError = parseCommandLine(&errorMessage, &canContinue);
     if (hasError)
     {
-        LOG("Command line:" A(errorMessage));
+        LOG("Command line:" QVLOG_A(errorMessage));
         if (!canContinue)
         {
             LOG("Fatal, Qv2ray cannot continue.");
@@ -247,7 +247,7 @@ bool Qv2rayPlatformApplication::parseCommandLine(QString *errorMessage, bool *ca
     }
 
 #define ProcessExtraStartupOptions(option)                                                                                                           \
-    DEBUG("Startup Options:" A(parser.isSet(option##Option)));                                                                                       \
+    DEBUG("Startup Options:" QVLOG_A(parser.isSet(option##Option)));                                                                                 \
     StartupArguments.option = parser.isSet(option##Option);
 
     ProcessExtraStartupOptions(noAPI);