Merge branch 'main' into chr_iswindows

Author: chrchr-github

.clang-tidy

@@ -19,8 +19,9 @@ Checks: >
         -openmp-*,
         -zircon-*,
         cert-err34-c,
-        google-explicit-constructor,
+        cppcoreguidelines-pro-type-static-cast-downcast,
         cppcoreguidelines-rvalue-reference-param-not-moved,
+        google-explicit-constructor,
         -bugprone-assignment-in-if-condition,
         -bugprone-branch-clone,
         -bugprone-easily-swappable-parameters,
@@ -40,37 +41,44 @@ Checks: >
         -modernize-avoid-c-arrays,
         -modernize-deprecated-ios-base-aliases,
         -misc-include-cleaner,
+        -misc-unused-using-decls,
         -modernize-loop-convert,
+        -modernize-macro-to-enum,
         -modernize-raw-string-literal,
         -modernize-replace-auto-ptr,
         -modernize-return-braced-init-list,
-        -modernize-use-auto,
+        -modernize-type-traits,
+        -modernize-use-designated-initializers,
+        -modernize-use-nodiscard,
+        -modernize-use-scoped-lock,
         -modernize-use-trailing-return-type,
         -performance-avoid-endl,
         -performance-inefficient-string-concatenation,
         -performance-no-automatic-move,
-        -performance-noexcept-swap,
+        -portability-avoid-pragma-once,
         -portability-simd-intrinsics,
         -portability-std-allocator-const,
-        -readability-avoid-const-params-in-decls,
+        -readability-avoid-nested-conditional-operator,
         -readability-braces-around-statements,
-        -readability-const-return-type,
         -readability-container-data-pointer,
-        -readability-convert-member-functions-to-static,
+        -readability-enum-initial-value,
         -readability-function-cognitive-complexity,
         -readability-function-size,
         -readability-identifier-length,
         -readability-identifier-naming,
         -readability-implicit-bool-conversion,
         -readability-isolate-declaration,
         -readability-magic-numbers,
-        -readability-redundant-access-specifiers,
         -readability-suspicious-call-argument,
-        -readability-uppercase-literal-suffix
+        -readability-uppercase-literal-suffix,
+        -readability-use-concise-preprocessor-directives
 WarningsAsErrors: '*'
-HeaderFilterRegex: '(cli|gui|lib|oss-fuzz|test|triage)\/[a-z]+\.h'
+HeaderFilterRegex: '(cli|gui|frontend|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
+ExcludeHeaderFilterRegex: 'ui_.*.h'
 CheckOptions:
   - key:             misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
     value:           '1'
   - key:             readability-simplify-boolean-expr.SimplifyDeMorgan
     value:           '0'
+  - key:             modernize-use-trailing-return-type.TransformFunctions
+    value:           false

.github/workflows/CI-cygwin.yml

@@ -1,14 +1,13 @@
-# Some convenient links:
-# - https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md
-#
-
+# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: CI-cygwin
 
 on:
   push:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:
@@ -21,11 +20,13 @@ defaults:
     shell: cmd
 
 jobs:
+  # TODO: add CMake build
   build_cygwin:
     strategy:
       matrix:
-        os: [windows-2022]
-        arch: [x64]
+        # only use the latest windows-* as the installed toolchain is identical
+        os: [windows-2025]
+        platform: [x86_64]
         include:
           - platform: 'x86_64'
             packages: |
@@ -36,18 +37,20 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Set up Cygwin
         uses: cygwin/cygwin-install-action@master
         with:
-          platform: ${{ matrix.arch }}
+          platform: ${{ matrix.platform }}
           packages: ${{ matrix.packages }}
 
       # Cygwin will always link the binaries even if they already exist. The linking is also extremely slow. So just run the "check" target which includes all the binaries.
       - name: Build all and run test
         run: |
-          C:\cygwin\bin\bash.exe -l -c cd %GITHUB_WORKSPACE% && make VERBOSE=1 -j2 check
+          C:\cygwin\bin\bash.exe -l -c cd %GITHUB_WORKSPACE% && make VERBOSE=1 -j%NUMBER_OF_PROCESSORS% CXXOPTS="-Werror" test
 
       - name: Extra test for misra
         run: |

.github/workflows/CI-mingw.yml

@@ -1,14 +1,13 @@
-# Some convenient links:
-# - https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md
-#
-
+# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: CI-mingw
 
 on:
   push:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:
@@ -21,26 +20,33 @@ defaults:
     shell: msys2 {0}
 
 jobs:
+  # TODO: add CMake build
   build_mingw:
     strategy:
       matrix:
-        # the MinGW installation in windows-2019 is supposed to be 8.1 but it is 12.2
-        # the MinGW installation in windows-2022 is not including all necessary packages by default, so just use the older image instead - package versions are he same
-        os: [windows-2019]
+        # only use the latest windows-* as the installed toolchain is identical
+        os: [windows-2025]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
+    timeout-minutes: 19 # max + 3*std of the last 7K runs
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Set up MSYS2
         uses: msys2/setup-msys2@v2
         with:
           release: false # use pre-installed
+          # TODO: install mingw-w64-x86_64-make and use mingw32.make instead - currently fails with "Windows Subsystem for Linux has no installed distributions."
           install: >-
             mingw-w64-x86_64-lld
             mingw-w64-x86_64-ccache
+            make
+            mingw-w64-x86_64-gcc
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -51,22 +57,19 @@ jobs:
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j2 cppcheck
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" cppcheck
 
       - name: Build test
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j2 testrunner
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" testrunner
 
       - name: Run test
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j2 check
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" test

.github/workflows/CI-unixish-docker.yml

@@ -7,19 +7,24 @@ on:
     branches:
       - 'main'
       - 'releases/**'
+      - '2.*'
     tags:
       - '2.*'
   pull_request:
 
 permissions:
   contents: read
-
+  
 jobs:
   build_cmake:
 
     strategy:
       matrix:
-        image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:23.04"]
+        image: ["ubuntu:24.04"]
+        include:
+          - build_gui: false
+          - image: "ubuntu:24.04"
+            build_gui: true
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -33,72 +38,51 @@ jobs:
       image: ${{ matrix.image }}
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install missing software on CentOS 7
-        if: matrix.image == 'centos:7'
-        run: |
-          yum install -y cmake gcc-c++ make pcre-devel
-          yum --enablerepo=extras install -y epel-release
-          yum install -y ccache
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Install missing software on ubuntu
         if: contains(matrix.image, 'ubuntu')
         run: |
           apt-get update
           apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
 
-      # required so a default Qt installation is configured
-      - name: Install missing software on ubuntu 18.04
-        if: false # matrix.os == 'ubuntu-18.04'
+      - name: Install missing software (gui) on latest ubuntu
+        if: matrix.build_gui
         run: |
-          sudo apt-get install qt5-default
+          apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev
 
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
-      # - it doesn't support centos
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
-        if: matrix.image != 'ubuntu:14.04' # no support for --set-config
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
-      # tests require CMake 3.9 - no ccache available
-      - name: CMake build (no tests / no ccache)
-        if: matrix.image == 'ubuntu:14.04'
+      - name: CMake build
+        if: ${{ !matrix.build_gui }}
         run: |
           mkdir cmake.output
           cd cmake.output
-          cmake -G "Unix Makefiles" -DHAVE_RULES=On ..
+          cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
           cmake --build . -- -j$(nproc)
 
-      # tests require CMake 3.9 - ccache available
-      - name: CMake build (no tests)
-        if: matrix.image == 'centos:7' || matrix.image == 'ubuntu:16.04'
+      - name: CMake build (with GUI)
+        if: matrix.build_gui
         run: |
-          mkdir cmake.output
-          cd cmake.output
-          cmake -G "Unix Makefiles" -DHAVE_RULES=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
-          cmake --build . -- -j$(nproc)
-
-      - name: CMake build
-        if: matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04'
-        run: |
-          mkdir cmake.output
-          cd cmake.output
-          cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
-          cmake --build . -- -j$(nproc)
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake --build cmake.output -- -j$(nproc)
 
       - name: Run CMake test
-        if: matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04'
         run: |
           cmake --build cmake.output --target check -- -j$(nproc)
 
   build_make:
 
     strategy:
       matrix:
-        image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:23.04"]
+        image: ["ubuntu:24.04"]
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -107,14 +91,9 @@ jobs:
       image: ${{ matrix.image }}
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install missing software on CentOS 7
-        if: matrix.image == 'centos:7'
-        run: |
-          yum install -y gcc-c++ make which python3 pcre-devel
-          yum --enablerepo=extras install -y epel-release
-          yum install -y ccache
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Install missing software on ubuntu
         if: contains(matrix.image, 'ubuntu')
@@ -124,33 +103,29 @@ jobs:
 
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
-      # - it doesn't support centos
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
-        if: matrix.image != 'ubuntu:14.04' # no support for --set-config
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
       - name: Build cppcheck
         run: |
-          # "/usr/lib64" for centos / "/usr/lib" for ubuntu
-          export PATH="/usr/lib64/ccache:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) HAVE_RULES=yes
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror"
 
       - name: Build test
         run: |
-          # "/usr/lib64" for centos / "/usr/lib" for ubuntu
-          export PATH="/usr/lib64/ccache:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) testrunner HAVE_RULES=yes
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror" testrunner
 
       - name: Run test
         run: |
-          make -j$(nproc) check HAVE_RULES=yes
+          make -j$(nproc) HAVE_RULES=yes test
 
       # requires python3
       - name: Run extra tests
         run: |
-          tools/generate_and_run_more_tests.sh
+          test/scripts/generate_and_run_more_tests.sh
 
       # requires which
       - name: Validate
@@ -161,10 +136,3 @@ jobs:
         run: |
           ./cppcheck --addon=threadsafety addons/test/threadsafety
           ./cppcheck --addon=threadsafety --std=c++03 addons/test/threadsafety
-
-      - name: Generate Qt help file on ubuntu 18.04
-        if: false # matrix.os == 'ubuntu-18.04'
-        run: |
-          pushd gui/help
-          qcollectiongenerator online-help.qhcp -o online-help.qhc
-