From b0ba3b9093e2cb71447ee30220b5a55a5246b2a4 Mon Sep 17 00:00:00 2001 From: silverqx Date: Mon, 3 Jun 2024 22:08:40 +0200 Subject: [PATCH] rename macro function --- qmake/common/common.pri | 2 +- src/orm/libraryinfo.cpp | 12 ++++++------ tom/src/tom/commands/aboutcommand.cpp | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qmake/common/common.pri b/qmake/common/common.pri index 0f44921ae..ef4cb495c 100644 --- a/qmake/common/common.pri +++ b/qmake/common/common.pri @@ -8,7 +8,7 @@ load(tiny_dotenv) CONFIG *= qt c++20 strict_c++ warn_on utf8_source hide_symbols no_keywords no_include_pwd CONFIG *= tiny_system_headers -CONFIG *= silent +#CONFIG *= silent CONFIG -= c++11 app_bundle # Qt defines diff --git a/src/orm/libraryinfo.cpp b/src/orm/libraryinfo.cpp index b64bf582f..27e3b959b 100644 --- a/src/orm/libraryinfo.cpp +++ b/src/orm/libraryinfo.cpp @@ -62,9 +62,9 @@ QVersionNumber LibraryInfo::version() noexcept TINYORM_VERSION_BUGFIX); } -#ifndef TINY_CMAKE_BOOL -/*! Convert the CMake BOOL type value passed by the the C macro to the ON/OFF QString. */ -# define TINY_CMAKE_BOOL(value) TypeUtils::isCMakeTrue(TINY_STRINGIFY(value)) ? ON : OFF +#ifndef TINY_MACRO_BOOL +/*! Convert the macro BOOL type value passed by the the C macro to the ON/OFF QString. */ +# define TINY_MACRO_BOOL(value) TypeUtils::isCMakeTrue(TINY_STRINGIFY(value)) ? ON : OFF #endif std::map LibraryInfo::ormCMacrosMap() @@ -113,7 +113,7 @@ std::map LibraryInfo::ormCMacrosMap() #endif // CMake ON/OFF #ifdef TINYORM_LTO - {sl("TINYORM_LTO"), TINY_CMAKE_BOOL(TINYORM_LTO)}, + {sl("TINYORM_LTO"), TINY_MACRO_BOOL(TINYORM_LTO)}, #endif #ifdef TINYORM_MYSQL_PING {sl("TINYORM_MYSQL_PING"), ON}, @@ -133,7 +133,7 @@ std::map LibraryInfo::ormCMacrosMap() #endif // CMake ON/OFF #ifdef TINYORM_STRICT_MODE - {sl("TINYORM_STRICT_MODE"), TINY_CMAKE_BOOL(TINYORM_STRICT_MODE)}, + {sl("TINYORM_STRICT_MODE"), TINY_MACRO_BOOL(TINYORM_STRICT_MODE)}, #endif // Newline needed - QtCreator syntax highlighting bug #ifdef TINYORM_TESTS_CODE @@ -154,7 +154,7 @@ std::map LibraryInfo::ormCMacrosMap() // CMake ON/OFF #ifdef TINYORM_MSVC_RUNTIME_DYNAMIC {sl("TINYORM_MSVC_RUNTIME_DYNAMIC"), - TINY_CMAKE_BOOL(TINYORM_MSVC_RUNTIME_DYNAMIC)}, + TINY_MACRO_BOOL(TINYORM_MSVC_RUNTIME_DYNAMIC)}, #endif }; } diff --git a/tom/src/tom/commands/aboutcommand.cpp b/tom/src/tom/commands/aboutcommand.cpp index 21cfe35bf..bc89eeb10 100644 --- a/tom/src/tom/commands/aboutcommand.cpp +++ b/tom/src/tom/commands/aboutcommand.cpp @@ -303,9 +303,9 @@ QVector AboutCommand::gatherAllAboutInformation() const using Orm::Constants::OFF; using Orm::Constants::ON; -#ifndef TINY_CMAKE_BOOL -/*! Convert the CMake BOOL type value passed by the the C macro to the ON/OFF QString. */ -# define TINY_CMAKE_BOOL(value) TypeUtils::isCMakeTrue(TINY_STRINGIFY(value)) ? ON : OFF +#ifndef TINY_MACRO_BOOL +/*! Convert the macro BOOL type value passed by the the C macro to the ON/OFF QString. */ +# define TINY_MACRO_BOOL(value) TypeUtils::isCMakeTrue(TINY_STRINGIFY(value)) ? ON : OFF #endif #endif // TINYORM_MSVC_RUNTIME_DYNAMIC @@ -333,11 +333,11 @@ QVector AboutCommand::gatherEnvironmentInformation() const // CMake ON/OFF // qmake has bad support for ltcg so it's not handled in qmake (don't do it in future) #ifdef TINYORM_LTO - {sl("Link Time Optimization"), TINY_CMAKE_BOOL(TINYORM_LTO)}, + {sl("Link Time Optimization"), TINY_MACRO_BOOL(TINYORM_LTO)}, #endif #ifdef TINYORM_MSVC_RUNTIME_DYNAMIC {sl("MSVC Runtime dynamic"), - TINY_CMAKE_BOOL(TINYORM_MSVC_RUNTIME_DYNAMIC)}, + TINY_MACRO_BOOL(TINYORM_MSVC_RUNTIME_DYNAMIC)}, #endif // Newline needed - QtCreator syntax highlighting bug #ifdef TINYTOM_CMAKE_MSVC_RUNTIME_LIBRARY