adjusted suppressions for differences in generated Qt code between versions

Author: firewave

.github/workflows/CI-unixish.yml

@@ -76,7 +76,7 @@ jobs:
           #./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json --enable=internal lib || ec=1
           # check gui with qt settings
           mkdir b2
-          ./cppcheck $selfcheck_options $cppcheck_options $gui_options --cppcheck-build-dir=b2 --addon=naming.json -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
+          ./cppcheck $selfcheck_options $cppcheck_options $gui_options --cppcheck-build-dir=b2 --addon=naming.json --suppress=simplifyUsing:*/moc_*.cpp -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
           # self check test and tools
           #./cppcheck $selfcheck_options $cppcheck_options -Ifrontend -Icli test/*.cpp  || ec=1
           #./cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1

.github/workflows/ubsan.yml

@@ -94,12 +94,13 @@ jobs:
           selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude,information --exception-handling --debug-warnings --check-level=exhaustive"
           cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
           gui_options="-DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
+          gui_options="$gui_options --suppress=autoNoType:*/moc_*.cpp --suppress=symbolDatabaseWarning:*/moc_*.cpp"
           ec=0
           #./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
           #./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json frontend || ec=1
           #./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json -Ifrontend cli || ec=1
           #./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options $gui_options --addon=naming.json -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options $gui_options --addon=naming.json --suppress=constVariablePointer:*/moc_*.cpp -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
           #./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli -Ifrontend test/*.cpp || ec=1
           #./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1

.selfcheck_suppressions

@@ -5,12 +5,6 @@ checkersReport
 # temporary suppressions - fix the warnings!
 simplifyUsing:lib/valueptr.h
 naming-privateMemberVariable:gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
-simplifyUsing:*/moc_checkthread.cpp
-simplifyUsing:*/moc_codeeditstylecontrols.cpp
-simplifyUsing:*/moc_resultstree.cpp
-simplifyUsing:*/moc_resultsview.cpp
-simplifyUsing:*/moc_threadhandler.cpp
-simplifyUsing:*/moc_threadresult.cpp
 bitwiseOnBoolean:lib/library.cpp
 templateInstantiation:lib/checkunusedfunctions.cpp
 templateInstantiation:lib/errorlogger.cpp