Merge branch 'danmar:main' into chr_14119

Author: chrchr-github

CMakeLists.txt

@@ -92,9 +92,16 @@ add_custom_target(copy_addons ALL
         "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/addons"
     COMMENT "Copying addons files to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
 
+add_custom_target(remove_unsigned_platforms ALL
+        ${CMAKE_COMMAND} -E remove -f
+        "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms/unix32-unsigned.xml"
+        "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms/unix64-unsigned.xml"
+        COMMENT "Removing unsigned platforms files from ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
+
 add_custom_target(copy_platforms ALL
     ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/platforms"
     "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms"
+    DEPENDS remove_unsigned_platforms
     COMMENT "Copying platforms files to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
 
 if(USE_BUNDLED_TINYXML2)

addons/test/misra/misra-test.c

@@ -725,7 +725,7 @@ static void misra_10_3(uint32_t u32a, uint32_t u32b) {
     res = 0.1f; // 10.3
     const char c = '0'; // no-warning
     bool b = true; // no-warning
-    uint32_t u = UINT32_C(10); // 17.3 no-warning
+    uint32_t u = UINT32_C(10); // no-warning
 }
 
 static void misra_10_4(u32 x, s32 y) {

cli/cmdlineparser.cpp

@@ -1608,18 +1608,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mLogger.printError(errstr);
             return Result::Fail;
         }
-
-        // TODO: remove
-        // these are loaded via external files and thus have Settings::PlatformFile set instead.
-        // override the type so they behave like the regular platforms.
-        if (platform == "unix32-unsigned") {
-            mSettings.platform.type = Platform::Type::Unix32;
-            mLogger.printMessage("The platform 'unix32-unsigned' has been deprecated and will be removed in Cppcheck 2.19. Please use '--platform=unix32 --funsigned-char' instead");
-        }
-        else if (platform == "unix64-unsigned") {
-            mSettings.platform.type = Platform::Type::Unix64;
-            mLogger.printMessage("The platform 'unix64-unsigned' has been deprecated and will be removed in Cppcheck 2.19. Please use '--platform=unix64 --funsigned-char' instead");
-        }
     }
 
     if (defaultSign != '\0')